mirror of
https://git.in.rschanz.org/ryan77627/guix.git
synced 2024-12-24 21:38:07 -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"))
|
(outputs '("out" "debug"))
|
||||||
(arguments
|
(arguments
|
||||||
`(#:parallel-build? #f ; help2man may be called too early
|
`(#:parallel-build? #f ; help2man may be called too early
|
||||||
#:phases (alist-cons-before
|
#:phases (modify-phases %standard-phases
|
||||||
'build 'patch-shell-references
|
(add-before 'build 'patch-shell-references
|
||||||
(lambda* (#:key inputs #:allow-other-keys)
|
(lambda _
|
||||||
(let ((bash (assoc-ref inputs "bash")))
|
|
||||||
;; 'split' uses either $SHELL or /bin/sh. Set $SHELL so
|
;; 'split' uses either $SHELL or /bin/sh. Set $SHELL so
|
||||||
;; that tests pass, since /bin/sh isn't in the chroot.
|
;; that tests pass, since /bin/sh isn't in the chroot.
|
||||||
(setenv "SHELL" (which "sh"))
|
(setenv "SHELL" (which "sh"))
|
||||||
|
|
||||||
(substitute* (find-files "gnulib-tests" "\\.c$")
|
(substitute* (find-files "gnulib-tests" "\\.c$")
|
||||||
(("/bin/sh")
|
(("/bin/sh") (which "sh")))
|
||||||
(format #f "~a/bin/sh" bash)))
|
|
||||||
(substitute* (find-files "tests" "\\.sh$")
|
(substitute* (find-files "tests" "\\.sh$")
|
||||||
(("#!/bin/sh")
|
(("#!/bin/sh") (which "sh")))
|
||||||
(format #f "#!~a/bin/sh" bash)))))
|
#t)))))
|
||||||
%standard-phases)))
|
|
||||||
(synopsis "Core GNU utilities (file, text, shell)")
|
(synopsis "Core GNU utilities (file, text, shell)")
|
||||||
(description
|
(description
|
||||||
"GNU Coreutils includes all of the basic command-line tools that are
|
"GNU Coreutils includes all of the basic command-line tools that are
|
||||||
|
|
Loading…
Reference in a new issue