all messages for Guix-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
* [PATCH 1/4] gnu: glib: Use modify-phases syntax.
@ 2016-04-03  2:30 宋文武
  2016-04-03  2:30 ` [PATCH 2/4] gnu: glib: Drop glib-tests-homedir.patch 宋文武
                   ` (4 more replies)
  0 siblings, 5 replies; 16+ messages in thread
From: 宋文武 @ 2016-04-03  2:30 UTC (permalink / raw)
  To: guix-devel; +Cc: 宋文武

* 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

^ permalink raw reply related	[flat|nested] 16+ messages in thread

end of thread, other threads:[~2016-04-19 12:25 UTC | newest]

Thread overview: 16+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-04-03  2:30 [PATCH 1/4] gnu: glib: Use modify-phases syntax 宋文武
2016-04-03  2:30 ` [PATCH 2/4] gnu: glib: Drop glib-tests-homedir.patch 宋文武
2016-04-03 10:09   ` Efraim Flashner
2016-04-03 17:00   ` Efraim Flashner
2016-04-03  2:30 ` [PATCH 3/4] gnu: glib: Disable tests in build phases instead of patches 宋文武
2016-04-03  2:55   ` 宋文武
2016-04-03 17:03     ` Efraim Flashner
2016-04-05  9:52       ` Ludovic Courtès
2016-04-03 17:11   ` Efraim Flashner
2016-04-03 18:00   ` Efraim Flashner
2016-04-04  5:26     ` 宋文武
2016-04-05 11:48       ` Efraim Flashner
2016-04-19 12:25         ` 宋文武
2016-04-03  2:30 ` [PATCH 4/4] gnu: glib: Update to 2.48.0 宋文武
2016-04-03 16:56 ` [PATCH 1/4] gnu: glib: Use modify-phases syntax Efraim Flashner
2016-04-07 12:03 ` Ludovic Courtès

Code repositories for project(s) associated with this external index

	https://git.savannah.gnu.org/cgit/guix.git

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.