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
This commit is contained in:
Maxim Cournoyer 2024-04-11 15:40:11 -04:00 committed by Ludovic Courtès
parent f9e761bf13
commit 6f057dfd8f
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5

View file

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