From e4360e16f932d0554ac9b1fe01b5c383bb0392ce Mon Sep 17 00:00:00 2001 From: John Darrington Date: Sun, 18 Sep 2016 10:15:39 +0200 Subject: gnu: gtk+ use modify-phases * gnu/packages/gtk.scm (arguments): Replace alist-cons-before with modify-phases --- gnu/packages/gtk.scm | 26 ++++++++++++-------------- 1 file changed, 12 insertions(+), 14 deletions(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 5f55c1ee6f..df79239951 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -673,20 +673,18 @@ (define-public gtk+ #:configure-flags (list (string-append "--with-html-dir=" (assoc-ref %outputs "doc") "/share/gtk-doc/html")) - #:phases - (alist-cons-before - 'configure 'pre-configure - (lambda _ - ;; Disable most tests, failing in the chroot with the message: - ;; D-Bus library appears to be incorrectly set up; failed to read - ;; machine uuid: Failed to open "/etc/machine-id": No such file or - ;; directory. - ;; See the manual page for dbus-uuidgen to correct this issue. - (substitute* "testsuite/Makefile.in" - (("SUBDIRS = gdk gtk a11y css reftests") - "SUBDIRS = gdk")) - #t) - %standard-phases))) + #:phases (modify-phases %standard-phases + (add-before 'configure 'pre-configure + (lambda _ + ;; Disable most tests, failing in the chroot with the message: + ;; D-Bus library appears to be incorrectly set up; failed to read + ;; machine uuid: Failed to open "/etc/machine-id": No such file or + ;; directory. + ;; See the manual page for dbus-uuidgen to correct this issue. + (substitute* "testsuite/Makefile.in" + (("SUBDIRS = gdk gtk a11y css reftests") + "SUBDIRS = gdk")) + #t))))) (native-search-paths (list (search-path-specification (variable "GUIX_GTK3_PATH") -- cgit v1.2.3