[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/03: gnu: coreutils: Update build phase.
From: |
Efraim Flashner |
Subject: |
01/03: gnu: coreutils: Update build phase. |
Date: |
Sat, 7 Oct 2017 17:59:48 -0400 (EDT) |
efraim pushed a commit to branch core-updates
in repository guix.
commit 656a5ba0d54739cf67d104b4fcb1126813f03f4e
Author: Efraim Flashner <address@hidden>
Date: Sat Oct 7 21:33:58 2017 +0300
gnu: coreutils: Update build phase.
* gnu/packages/base.scm (coreutils)[arguments]: Use 'modify-phases'
syntax. Substitute with 'which sh'.
---
gnu/packages/base.scm | 27 ++++++++++++---------------
1 file changed, 12 insertions(+), 15 deletions(-)
diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm
index 20f5ab7..be19c5f 100644
--- a/gnu/packages/base.scm
+++ b/gnu/packages/base.scm
@@ -320,21 +320,18 @@ used to apply commands with arbitrarily long arguments.")
(outputs '("out" "debug"))
(arguments
`(#:parallel-build? #f ; help2man may be called too early
- #:phases (alist-cons-before
- 'build 'patch-shell-references
- (lambda* (#:key inputs #:allow-other-keys)
- (let ((bash (assoc-ref inputs "bash")))
- ;; 'split' uses either $SHELL or /bin/sh. Set $SHELL so
- ;; that tests pass, since /bin/sh isn't in the chroot.
- (setenv "SHELL" (which "sh"))
-
- (substitute* (find-files "gnulib-tests" "\\.c$")
- (("/bin/sh")
- (format #f "~a/bin/sh" bash)))
- (substitute* (find-files "tests" "\\.sh$")
- (("#!/bin/sh")
- (format #f "#!~a/bin/sh" bash)))))
- %standard-phases)))
+ #:phases (modify-phases %standard-phases
+ (add-before 'build 'patch-shell-references
+ (lambda _
+ ;; 'split' uses either $SHELL or /bin/sh. Set $SHELL so
+ ;; that tests pass, since /bin/sh isn't in the chroot.
+ (setenv "SHELL" (which "sh"))
+
+ (substitute* (find-files "gnulib-tests" "\\.c$")
+ (("/bin/sh") (which "sh")))
+ (substitute* (find-files "tests" "\\.sh$")
+ (("#!/bin/sh") (which "sh")))
+ #t)))))
(synopsis "Core GNU utilities (file, text, shell)")
(description
"GNU Coreutils includes all of the basic command-line tools that are