[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
11/97: gnu: glib: Use modify-phases syntax.
From: |
Ludovic Courtès |
Subject: |
11/97: gnu: glib: Use modify-phases syntax. |
Date: |
Sat, 16 Apr 2016 09:49:29 +0000 |
civodul pushed a commit to branch gnome-updates
in repository guix.
commit 0f795a0a539fbaed8cda95d9575a5cfdec62b83f
Author: å®‹æ–‡æ¦ <address@hidden>
Date: Sat Apr 2 15:18:30 2016 +0800
gnu: glib: Use modify-phases syntax.
* gnu/packages/glib.scm (glib)[arguments]: Use 'modify-phases'.
---
gnu/packages/glib.scm | 38 +++++++++++++++++++-------------------
1 files changed, 19 insertions(+), 19 deletions(-)
diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm
index d5ea913..523116d 100644
--- a/gnu/packages/glib.scm
+++ b/gnu/packages/glib.scm
@@ -160,29 +160,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="
- branch gnome-updates created (now 95742f7), Ludovic Courtès, 2016/04/16
- 03/97: gnu: pixman: Update to 0.34.0., Ludovic Courtès, 2016/04/16
- 05/97: gnu: gobject-introspection: Remove cairo from inputs., Ludovic Courtès, 2016/04/16
- 06/97: gnu: poppler: Enable GObject introspection., Ludovic Courtès, 2016/04/16
- 01/97: gnu: gtk+: Enable SVG support., Ludovic Courtès, 2016/04/16
- 02/97: gnu: gtk+-2: Update to 2.24.30., Ludovic Courtès, 2016/04/16
- 08/97: gnu: poppler: Update to 0.42.0., Ludovic Courtès, 2016/04/16
- 09/97: gnu: freetype: Update to 2.6.3., Ludovic Courtès, 2016/04/16
- 10/97: gnu: freetype: Add libpng and zlib to propagated-inputs., Ludovic Courtès, 2016/04/16
- 07/97: gnu: dbus: Update to 1.10.8., Ludovic Courtès, 2016/04/16
- 11/97: gnu: glib: Use modify-phases syntax.,
Ludovic Courtès <=
- 04/97: gnu: cairo: Update to 1.14.6., Ludovic Courtès, 2016/04/16
- 15/97: gnu: harfbuzz: Update to 1.2.4., Ludovic Courtès, 2016/04/16
- 18/97: gnu: librsvg: Update to 2.40.15., Ludovic Courtès, 2016/04/16
- 21/97: gnu: libsigc++: Update to 2.8.0., Ludovic Courtès, 2016/04/16
- 16/97: gnu: shared-mime-info: Update to 1.6., Ludovic Courtès, 2016/04/16
- 12/97: gnu: glib: Drop glib-tests-homedir.patch., Ludovic Courtès, 2016/04/16
- 20/97: gnu: pango: Update to 1.40.0., Ludovic Courtès, 2016/04/16
- 14/97: gnu: glib: Update to 2.48.0., Ludovic Courtès, 2016/04/16
- 22/97: gnu: glibmm: Update to 2.48.1., Ludovic Courtès, 2016/04/16
- 23/97: gnu: atk: Update to 2.20.0., Ludovic Courtès, 2016/04/16