gnu: gtk+ use modify-phases

* gnu/packages/gtk.scm (arguments): Replace alist-cons-before with modify-phases
master
John Darrington 2016-09-18 10:15:39 +02:00
parent 5d87088c39
commit e4360e16f9
No known key found for this signature in database
GPG Key ID: 8A67719C2DE827B3
1 changed files with 12 additions and 14 deletions

View File

@ -673,20 +673,18 @@ application suites.")
#:configure-flags (list (string-append "--with-html-dir=" #:configure-flags (list (string-append "--with-html-dir="
(assoc-ref %outputs "doc") (assoc-ref %outputs "doc")
"/share/gtk-doc/html")) "/share/gtk-doc/html"))
#:phases #:phases (modify-phases %standard-phases
(alist-cons-before (add-before 'configure 'pre-configure
'configure 'pre-configure (lambda _
(lambda _ ;; Disable most tests, failing in the chroot with the message:
;; Disable most tests, failing in the chroot with the message: ;; D-Bus library appears to be incorrectly set up; failed to read
;; D-Bus library appears to be incorrectly set up; failed to read ;; machine uuid: Failed to open "/etc/machine-id": No such file or
;; machine uuid: Failed to open "/etc/machine-id": No such file or ;; directory.
;; directory. ;; See the manual page for dbus-uuidgen to correct this issue.
;; See the manual page for dbus-uuidgen to correct this issue. (substitute* "testsuite/Makefile.in"
(substitute* "testsuite/Makefile.in" (("SUBDIRS = gdk gtk a11y css reftests")
(("SUBDIRS = gdk gtk a11y css reftests") "SUBDIRS = gdk"))
"SUBDIRS = gdk")) #t)))))
#t)
%standard-phases)))
(native-search-paths (native-search-paths
(list (search-path-specification (list (search-path-specification
(variable "GUIX_GTK3_PATH") (variable "GUIX_GTK3_PATH")