gnu: gtk+: Simplify inputs.

Obtained by running:

  guix style --input-simplification=always gtk+ gtk+@2

* gnu/packages/gtk.scm (gtk+-2, gtk+): Simplify inputs.

gnu/packages/gtk.scm

@@ -861,33 +861,30 @@ is part of the GNOME accessibility project.")
     (build-system gnu-build-system)
     (outputs '("out" "bin" "doc" "debug"))
     (propagated-inputs
-     `(("atk" ,atk)
+     (list atk cairo
-       ("cairo" ,cairo)
+           (librsvg-for-system) glib pango))
-       ("gdk-pixbuf" ,(librsvg-for-system))
-       ("glib" ,glib)
-       ("pango" ,pango)))
     (inputs
-     `(("cups" ,cups)
+     (list cups
-       ("libx11" ,libx11)
+           libx11
-       ("libxcomposite" ,libxcomposite)
+           libxcomposite
-       ("libxcursor" ,libxcursor)
+           libxcursor
-       ("libxext" ,libxext)
+           libxext
-       ("libxdamage" ,libxdamage)
+           libxdamage
-       ("libxi" ,libxi)
+           libxi
-       ("libxinerama" ,libxinerama)
+           libxinerama
-       ("libxkbcommon" ,libxkbcommon)
+           libxkbcommon
-       ("libxrandr" ,libxrandr)
+           libxrandr
-       ("libxrender" ,libxrender)
+           libxrender
-       ("libxshmfence" ,libxshmfence)))
+           libxshmfence))
     (native-inputs
-     `(("gettext" ,gettext-minimal)
+     (list gettext-minimal
-       ("glib" ,glib "bin")
+           `(,glib "bin")
-       ("gobject-introspection" ,gobject-introspection)
+           gobject-introspection
-       ("intltool" ,intltool)
+           intltool
-       ("perl" ,perl)
+           perl
-       ("pkg-config" ,pkg-config)
+           pkg-config
-       ("python-wrapper" ,python-wrapper)
+           python-wrapper
-       ("xorg-server" ,xorg-server-for-tests)))
+           xorg-server-for-tests))
     (arguments
      `(#:parallel-tests? #f
        #:configure-flags
@@ -955,54 +952,54 @@ application suites.")
        (patches (search-patches "gtk3-respect-GUIX_GTK3_PATH.patch"
                                 "gtk3-respect-GUIX_GTK3_IM_MODULE_FILE.patch"))))
     (propagated-inputs
-     `(("atk" ,atk)
+     (list atk
-       ("at-spi2-atk" ,at-spi2-atk)
+           at-spi2-atk
-       ("cairo" ,cairo)
+           cairo
-       ("fribidi" ,fribidi)
+           fribidi
-       ("fontconfig" ,fontconfig)
+           fontconfig
-       ("freetype" ,freetype)
+           freetype
-       ("gdk-pixbuf" ,(librsvg-for-system))
+           (librsvg-for-system)
-       ("glib" ,glib)
+           glib
-       ("libcloudproviders" ,libcloudproviders-minimal)
+           libcloudproviders-minimal
-       ("libepoxy" ,libepoxy)
+           libepoxy
-       ("libx11" ,libx11)
+           libx11
-       ("libxcomposite" ,libxcomposite)
+           libxcomposite
-       ("libxcursor" ,libxcursor)
+           libxcursor
-       ("libxdamage" ,libxdamage)
+           libxdamage
-       ("libxext" ,libxext)
+           libxext
-       ("libxfixes" ,libxfixes)
+           libxfixes
-       ("libxi" ,libxi)
+           libxi
-       ("libxinerama" ,libxinerama)
+           libxinerama
-       ("libxkbcommon" ,libxkbcommon)
+           libxkbcommon
-       ("libxrandr" ,libxrandr)
+           libxrandr
-       ("libxrender" ,libxrender)
+           libxrender
-       ("mesa" ,mesa)
+           mesa
-       ("pango" ,pango)
+           pango
-       ("wayland" ,wayland)
+           wayland
-       ("wayland-protocols" ,wayland-protocols)))
+           wayland-protocols))
     (inputs
-     `(("colord" ,colord-minimal)       ;to prevent a cycle with inkscape
+     (list colord-minimal ;to prevent a cycle with inkscape
-       ("cups" ,cups)
+           cups
-       ("graphene" ,graphene)
+           graphene
-       ("harfbuzz" ,harfbuzz)
+           harfbuzz
-       ("iso-codes" ,iso-codes)
+           iso-codes
-       ("json-glib" ,json-glib-minimal)
+           json-glib-minimal
-       ("libxml2" ,libxml2)
+           libxml2
-       ("rest" ,rest)))
+           rest))
     (native-inputs
-     `(("docbook-xml" ,docbook-xml-4.1.2)
+     (list docbook-xml-4.1.2
-       ("gettext" ,gettext-minimal)
+           gettext-minimal
-       ("glib" ,glib "bin")
+           `(,glib "bin")
-       ("gobject-introspection" ,gobject-introspection)
+           gobject-introspection
-       ("hicolor-icon-theme" ,hicolor-icon-theme)
+           hicolor-icon-theme
-       ("perl" ,perl)
+           perl
-       ("pkg-config" ,pkg-config)
+           pkg-config
-       ("python-wrapper" ,python-wrapper)
+           python-wrapper
-       ("sassc" ,sassc)
+           sassc
-       ;; By using a special xorg-server for GTK+'s tests, we reduce the impact
+           ;; By using a special xorg-server for GTK+'s tests, we reduce the impact
-       ;; of updating xorg-server directly on the master branch.
+           ;; of updating xorg-server directly on the master branch.
-       ("xorg-server" ,xorg-server-for-tests)
+           xorg-server-for-tests
-       ("xsltproc" ,libxslt)))
+           libxslt))
     (arguments
      `(#:imported-modules ((guix build glib-or-gtk-build-system)
                            ,@%gnu-build-system-modules)