TakeV/guix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

gnu: coreutils: Update build phase.

Browse source 
* gnu/packages/base.scm (coreutils)[arguments]: Use 'modify-phases'
syntax. Substitute with 'which sh'.
This commit is contained in:
Efraim Flashner 2017-10-07 21:33:58 +03:00
parent b01981a9e2
commit 656a5ba0d5
No known key found for this signature in database
GPG key ID: 41AAE7DCCA3D8351
1 changed files with 11 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
gnu/packages/base.scm
View file

@ -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") (which "sh")))
(("#!/bin/sh") #t)))))
(format #f "#!~a/bin/sh" bash)))))
%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