[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 1/4] gnu: glib: Use modify-phases syntax.
From: |
宋文武 |
Subject: |
[PATCH 1/4] gnu: glib: Use modify-phases syntax. |
Date: |
Sun, 3 Apr 2016 10:30:28 +0800 |
* gnu/packages/glib.scm (glib)[arguments]: Use 'modify-phases'.
---
gnu/packages/glib.scm | 44 ++++++++++++++++++++++----------------------
1 file changed, 22 insertions(+), 22 deletions(-)
diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm
index 854a1f2..2fb601c 100644
--- a/gnu/packages/glib.scm
+++ b/gnu/packages/glib.scm
@@ -161,29 +161,29 @@ shared NFS home directories.")
("perl" ,perl) ; needed by GIO tests
("bash" ,bash)))
(arguments
- '(#:phases (alist-cons-before
- 'build 'pre-build
- (lambda* (#:key inputs outputs #:allow-other-keys)
- ;; For tests/gdatetime.c.
- (setenv "TZDIR"
- (string-append (assoc-ref inputs "tzdata")
- "/share/zoneinfo"))
-
- ;; Some tests want write access there.
- (setenv "XDG_CACHE_HOME" (getcwd))
-
- (substitute* '("glib/gspawn.c"
- "glib/tests/utils.c"
- "tests/spawn-test.c")
- (("/bin/sh")
- (string-append (assoc-ref inputs "bash") "/bin/sh")))
-
- ;; Disable a test that requires dbus.
- (substitute* "gio/tests/gdbus-serialization.c"
- (("g_test_add_func \
+ '(#:phases
+ (modify-phases %standard-phases
+ (add-before 'build 'pre-build
+ (lambda* (#:key inputs outputs #:allow-other-keys)
+ ;; For tests/gdatetime.c.
+ (setenv "TZDIR"
+ (string-append (assoc-ref inputs "tzdata")
+ "/share/zoneinfo"))
+
+ ;; Some tests want write access there.
+ (setenv "XDG_CACHE_HOME" (getcwd))
+
+ (substitute* '("glib/gspawn.c"
+ "glib/tests/utils.c"
+ "tests/spawn-test.c")
+ (("/bin/sh")
+ (string-append (assoc-ref inputs "bash") "/bin/sh")))
+
+ ;; Disable a test that requires dbus.
+ (substitute* "gio/tests/gdbus-serialization.c"
+ (("g_test_add_func \
\\(\"/gdbus/message-serialize/double-array\", test_double_array\\);" all)
- (string-append "/* " all " */"))))
- %standard-phases)
+ (string-append "/* " all " */"))))))
;; Note: `--docdir' and `--htmldir' are not honored, so work around it.
#:configure-flags (list (string-append "--with-html-dir="
--
2.6.3
- [PATCH 1/4] gnu: glib: Use modify-phases syntax.,
宋文武 <=
- [PATCH 2/4] gnu: glib: Drop glib-tests-homedir.patch., 宋文武, 2016/04/02
- [PATCH 4/4] gnu: glib: Update to 2.48.0., 宋文武, 2016/04/02
- [PATCH 3/4] gnu: glib: Disable tests in build phases instead of patches., 宋文武, 2016/04/02
- Re: [PATCH 3/4] gnu: glib: Disable tests in build phases instead of patches., Efraim Flashner, 2016/04/03
- Re: [PATCH 3/4] gnu: glib: Disable tests in build phases instead of patches., Efraim Flashner, 2016/04/03