On Sun, Apr 03, 2016 at 10:30:28AM +0800, 宋文武 wrote:
> * 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
> This looks good to me -- Efraim Flashner <efr...@flashner.co.il> אפרים פלשנר GPG key = A28B F40C 3E55 1372 662D 14F7 41AA E7DC CA3D 8351 Confidentiality cannot be guaranteed on emails sent or received unencrypted
signature.asc
Description: PGP signature
