From b47b2b52759e6c706fb988c220f913eff95c17cd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Mon, 9 Jun 2014 12:22:05 +0200 Subject: [PATCH] gnu: coreutils: Remove run-time dependency on Bash. * gnu/packages/base.scm (coreutils)[arguments] : Leave src/split.c unpatched. Set $SHELL. Use .../bin/sh and not .../bin/bash in tests. --- gnu/packages/base.scm | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm index 499690f666..cfa9a8ffcd 100644 --- a/gnu/packages/base.scm +++ b/gnu/packages/base.scm @@ -263,14 +263,16 @@ (define-public coreutils 'build 'patch-shell-references (lambda* (#:key inputs #:allow-other-keys) (let ((bash (assoc-ref inputs "bash"))) - (substitute* (cons "src/split.c" - (find-files "gnulib-tests" - "\\.c$")) + ;; '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/bash" bash))))) + (format #f "#!~a/bin/sh" bash))))) %standard-phases))) (synopsis "Core GNU utilities (file, text, shell)") (description