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

1 files changed, 39 insertions, 45 deletions

diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm
index 6c4fa2ea1c..9ac7207407 100644
--- a/gnu/packages/gtk.scm
+++ b/gnu/packages/gtk.scm
@@ -178,54 +178,48 @@ such as mate-panel and xfce4-panel.")
     (build-system glib-or-gtk-build-system)
     (outputs '("out" "doc"))
     (arguments
-     `(#:tests? #f ; see http://lists.gnu.org/archive/html/bug-guix/2013-06/msg00085.html
-       #:configure-flags
-       (list
-        "--disable-static"
-        ;; XXX: To be enabled.
-        ;; "--enable-gallium=yes"
-        ;; "--enable-gl=yes"
-        ;; " --enable-glesv2=yes"
-        ;; "--enable-glesv3=yes"
-        ;; "--enable-cogl=yes"
-        ;; "--enable-directfb=yes"
-        ;; "--enable-vg=yes"
-        "--enable-tee=yes"              ;needed for GNU IceCat
-        "--enable-xml=yes"              ;for cairo-xml support
-        (string-append "--with-html-dir="
-                       (assoc-ref %outputs "doc")
-                       "/share/gtk-doc/html"))))
+     (list
+      #:tests? #f ; see http://lists.gnu.org/archive/html/bug-guix/2013-06/msg00085.html
+      #:configure-flags
+      #~(list
+         "--disable-static"
+         ;; XXX: To be enabled.
+         ;; "--enable-gallium=yes"
+         ;; "--enable-gl=yes"
+         ;; " --enable-glesv2=yes"
+         ;; "--enable-glesv3=yes"
+         ;; "--enable-cogl=yes"
+         ;; "--enable-directfb=yes"
+         ;; "--enable-vg=yes"
+         "--enable-tee=yes"             ;needed for GNU IceCat
+         "--enable-xml=yes"             ;for cairo-xml support
+         (string-append "--with-html-dir=" #$output:doc
+                        "/share/gtk-doc/html"))))
     (native-inputs
-     `(,@(if (target-hurd?)
-             '()
-             `(("gobject-introspection" ,gobject-introspection)))
-       ("pkg-config" ,pkg-config)
-       ("python" ,python-wrapper)))
+     (append (list pkg-config
+                   python-wrapper)
+             (if (target-hurd?)
+                 '()
+                 (list gobject-introspection))))
     (inputs
-     `(("bash-minimal" ,bash-minimal)   ;for glib-or-gtk-wrap
-       ,@(if (target-hurd?)
-             '()
-             `(("drm" ,libdrm)))
-       ("ghostscript" ,ghostscript)
-       ("libspectre" ,libspectre)
-       ,@(if (target-hurd?)
-             '()
-             `(("poppler" ,poppler)))))
+     (append
+      (list bash-minimal                ;for glib-or-gtk-wrap
+            ghostscript
+            libspectre)
+      (if (target-hurd?)
+          '()
+          (list libdrm
+                poppler))))
     (propagated-inputs
-     `( ;; ("cogl" ,cogl)
-       ;; ("directfb" ,directfb)
-       ("fontconfig" ,fontconfig)
-       ("freetype" ,freetype)
-       ("glib" ,glib)
-       ;; ("gtk+" ,gtk+)
-       ("libpng" ,libpng)
-       ;; ("librsvg" ,librsvg)
-       ;; ("opengl" ,mesa)
-       ("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