diff options
author | Efraim Flashner <efraim@flashner.co.il> | 2016-01-05 21:13:57 +0200 |
---|---|---|
committer | Efraim Flashner <efraim@flashner.co.il> | 2016-01-05 21:13:57 +0200 |
commit | e5f037624e42e9b388d1a68a24b77bc2283c58f4 (patch) | |
tree | 347dab40dd94b8d73968d3afeb245a104d5a151d | |
parent | d99861d39d19260659a509e22b053709b853451a (diff) | |
download | guix-e5f037624e42e9b388d1a68a24b77bc2283c58f4.tar.gz |
gnu: gettext: Use "modify-phases" syntax.
* gnu/packages/gettext.scm (gettext)[arguments]: Use "modify-phases" syntax.
-rw-r--r-- | gnu/packages/gettext.scm | 59 |
1 files changed, 29 insertions, 30 deletions
diff --git a/gnu/packages/gettext.scm b/gnu/packages/gettext.scm index 3dc3b2f8bc..7cd1ab73e7 100644 --- a/gnu/packages/gettext.scm +++ b/gnu/packages/gettext.scm @@ -55,38 +55,37 @@ (inputs `(("expat" ,expat))) (arguments - `(#:phases (alist-cons-before - 'check 'patch-tests - (lambda* (#:key inputs #:allow-other-keys) - (let* ((bash (which "sh"))) - ;; Some of the files we're patching are - ;; ISO-8859-1-encoded, so choose it as the default - ;; encoding so the byte encoding is preserved. - (with-fluids ((%default-port-encoding #f)) - (substitute* - (find-files "gettext-tools/tests" - "^(lang-sh|msg(exec|filter)-[0-9])") - (("#![[:blank:]]/bin/sh") - (format #f "#!~a" bash))) + `(#:phases + (modify-phases %standard-phases + (add-before 'check 'patch-tests + (lambda* (#:key inputs #:allow-other-keys) + (let* ((bash (which "sh"))) + ;; Some of the files we're patching are + ;; ISO-8859-1-encoded, so choose it as the default + ;; encoding so the byte encoding is preserved. + (with-fluids ((%default-port-encoding #f)) + (substitute* + (find-files "gettext-tools/tests" + "^(lang-sh|msg(exec|filter)-[0-9])") + (("#![[:blank:]]/bin/sh") + (format #f "#!~a" bash))) - (substitute* (cons "gettext-tools/src/msginit.c" - (find-files "gettext-tools/gnulib-tests" - "posix_spawn")) - (("/bin/sh") - bash)) + (substitute* (cons "gettext-tools/src/msginit.c" + (find-files "gettext-tools/gnulib-tests" + "posix_spawn")) + (("/bin/sh") + bash)) - (substitute* "gettext-tools/src/project-id" - (("/bin/pwd") - "pwd"))))) - (alist-cons-before - 'configure 'link-expat - (lambda _ - ;; Gettext defaults to opening expat via dlopen on - ;; "Linux". Change to link directly. - (substitute* "gettext-tools/configure" - (("LIBEXPAT=\"-ldl\"") "LIBEXPAT=\"-ldl -lexpat\"") - (("LTLIBEXPAT=\"-ldl\"") "LTLIBEXPAT=\"-ldl -lexpat\""))) - %standard-phases)) + (substitute* "gettext-tools/src/project-id" + (("/bin/pwd") + "pwd")))))) + (add-before 'configure 'link-expat + (lambda _ + ;; Gettext defaults to opening expat via dlopen on + ;; "Linux". Change to link directly. + (substitute* "gettext-tools/configure" + (("LIBEXPAT=\"-ldl\"") "LIBEXPAT=\"-ldl -lexpat\"") + (("LTLIBEXPAT=\"-ldl\"") "LTLIBEXPAT=\"-ldl -lexpat\""))))) ;; When tests fail, we want to know the details. #:make-flags '("VERBOSE=yes"))) |