mirror of
https://git.in.rschanz.org/ryan77627/guix.git
synced 2024-12-23 21:17:11 -05:00
gnu: coreutils: Update build phase.
* gnu/packages/base.scm (coreutils)[arguments]: Use 'modify-phases' syntax. Substitute with 'which sh'.
This commit is contained in:
parent
b01981a9e2
commit
656a5ba0d5
1 changed files with 11 additions and 14 deletions
|
@ -320,21 +320,18 @@ (define-public coreutils
|
|||
(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"))
|
||||
#: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")
|
||||
(format #f "~a/bin/sh" bash)))
|
||||
(substitute* (find-files "tests" "\\.sh$")
|
||||
(("#!/bin/sh")
|
||||
(format #f "#!~a/bin/sh" bash)))))
|
||||
%standard-phases)))
|
||||
(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
|
||||
|
|
Loading…
Reference in a new issue