diff options
| author | Danny Milosavljevic <dannym@scratchpost.org> | 2017-03-18 10:31:26 +0100 |
|---|---|---|
| committer | Danny Milosavljevic <dannym@scratchpost.org> | 2017-03-18 10:37:02 +0100 |
| commit | 84aac61c819cf2c82d8d4b54cdf53ed9e713a82f (patch) | |
| tree | 5ebbacafe5fa3907f71ca4aa905a85f3d19cd143 /gnu | |
| parent | 6d5f63b690586e819258617a8d0fb9bd18897b8f (diff) | |
| download | guix-84aac61c819cf2c82d8d4b54cdf53ed9e713a82f.tar.gz | |
gnu: rustc: Fix process test.
* gnu/packages/rust.scm (rustc)[arguments]: Rename 'patch-lockfile-test to 'patch-tests. Add another substitution.
Diffstat (limited to 'gnu')
| -rw-r--r-- | gnu/packages/rust.scm | 9 |
1 files changed, 6 insertions, 3 deletions
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")) |