gnu: cairo: Remove labels and use gexps.

* gnu/packages/gtk.scm (cairo)
[arguments] <configure-flags>: Use gexps.
[native-inputs, inputs]: Remove labels.

Change-Id: Ifc4d9435bc1e203ee4427452ad26dedbac2de9fc

gnu/packages/gtk.scm

@@ -183,10 +183,11 @@ (define cairo
      `(#:tests? #f ; see http://lists.gnu.org/archive/html/bug-guix/2013-06/msg00085.html
        #:glib-or-gtk? #t
        #:configure-flags
-       (list "-Dtests=disabled")
+       ,#~(list "-Dtests=disabled")
        ,@(if (%current-target-system)
-             `(#:phases
-               (modify-phases %standard-phases
+             (list
+              #:phases
+              #~(modify-phases %standard-phases
                   (add-after 'unpack 'fix-cross-compilation
                     (lambda _
                       ;; XXX: Let meson-build-system customize the property
@@ -197,31 +198,30 @@ (define cairo
                          "'ipc_rmid_deferred_release', 'true'"))))))
              '())))
     (native-inputs
-     `(,@(if (target-hurd?)
+     (append (list pkg-config
+                   python-wrapper)
+             (if (target-hurd?)
                  '()
-             `(("gobject-introspection" ,gobject-introspection)))
-       ("pkg-config" ,pkg-config)
-       ("python" ,python-wrapper)))
+                 (list gobject-introspection))))
     (inputs
-     `(("bash-minimal" ,bash-minimal)   ;for glib-or-gtk-wrap
-       ,@(if (target-hurd?)
+     (append
+      (list bash-minimal                ;for glib-or-gtk-wrap
+            ghostscript
+            libspectre)
+      (if (target-hurd?)
           '()
-             `(("drm" ,libdrm)))
-       ("ghostscript" ,ghostscript)
-       ("libspectre" ,libspectre)
-       ,@(if (target-hurd?)
-             '()
-             `(("poppler" ,poppler)))))
+          (list libdrm
+                poppler))))
     (propagated-inputs
-     `(("fontconfig" ,fontconfig)
-       ("freetype" ,freetype)
-       ("glib" ,glib)
-       ("libpng" ,libpng)
-       ("pixman" ,pixman)
-       ("x11" ,libx11)
-       ("xcb" ,libxcb)
-       ("xext" ,libxext)
-       ("xrender" ,libxrender)))
+     (list fontconfig
+           freetype
+           glib
+           libpng
+           pixman
+           libx11
+           libxcb
+           libxext
+           libxrender))
     (synopsis "Multi-platform 2D graphics library")
     (description "Cairo is a 2D graphics library with support for multiple output
 devices.  Currently supported output targets include the X Window System (via