From 84aac61c819cf2c82d8d4b54cdf53ed9e713a82f Mon Sep 17 00:00:00 2001 From: Danny Milosavljevic Date: Sat, 18 Mar 2017 10:31:26 +0100 Subject: gnu: rustc: Fix process test. * gnu/packages/rust.scm (rustc)[arguments]: Rename 'patch-lockfile-test to 'patch-tests. Add another substitution. --- gnu/packages/rust.scm | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'gnu/packages/rust.scm') diff --git a/gnu/packages/rust.scm b/gnu/packages/rust.scm index efac79c515..2dedef8373 100644 --- a/gnu/packages/rust.scm +++ b/gnu/packages/rust.scm @@ -234,10 +234,13 @@ rustc-bootstrap and cargo-bootstrap packages.") (lambda _ (setenv "SHELL" (which "sh")) (setenv "CONFIG_SHELL" (which "sh")))) - (add-after 'unpack 'patch-lockfile-test - (lambda _ + (add-after 'unpack 'patch-tests + (lambda* (#:key inputs #:allow-other-keys) (substitute* "src/tools/tidy/src/main.rs" - (("^.*cargo.*::check.*$") "")))) + (("^.*cargo.*::check.*$") "")) + (substitute* "src/libstd/process.rs" + (("\"/bin/sh\"") (string-append "\"" (assoc-ref inputs "bash") "/bin/sh\""))) + #t)) (replace 'configure (lambda* (#:key inputs outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) -- cgit v1.2.3