nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

gnu: glib: Return #t from all phases. 

* gnu/packages/glib.scm (glib)[arguments]: In the 'check' phase, use
'for-each' instead to avoid assuming that 'disable' will return a true value.
Return #t from the 'pre-build' and 'check' phases.
This commit is contained in:
Mark H Weaver 2018-03-17 22:28:56 -04:00
parent eed6985fc6
commit 81f6bf2d50
No known key found for this signature in database
GPG Key ID: 7CEF29847562C516
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gnu/packages/glib.scm
View File

@ -199,7 +199,8 @@ shared NFS home directories.")
"glib/tests/utils.c" "glib/tests/utils.c"
"tests/spawn-test.c") "tests/spawn-test.c")
(("/bin/sh") (("/bin/sh")
(string-append (assoc-ref inputs "bash") "/bin/sh"))))) (string-append (assoc-ref inputs "bash") "/bin/sh")))
#t))
(add-before 'check 'disable-failing-tests (add-before 'check 'disable-failing-tests
(lambda _ (lambda _
(let ((disable (let ((disable
@ -263,7 +264,8 @@ shared NFS home directories.")
("gio/tests/gdbus-unix-addresses.c" ("gio/tests/gdbus-unix-addresses.c"
(;; Requires /etc/machine-id. (;; Requires /etc/machine-id.
"/gdbus/x11-autolaunch"))))) "/gdbus/x11-autolaunch")))))
(and-map (lambda (x) (apply disable x)) failing-tests))))) (for-each (lambda (x) (apply disable x)) failing-tests)
#t))))
;; Note: `--docdir' and `--htmldir' are not honored, so work around it. ;; Note: `--docdir' and `--htmldir' are not honored, so work around it.
#:configure-flags (list (string-append "--with-html-dir=" #:configure-flags (list (string-append "--with-html-dir="