~ruther/guix-local: gnu: rustc: Fix process test.

84aac61c819cf2c82d8d4b54cdf53ed9e713a82f — Danny Milosavljevic 9 years ago 6d5f63b

gnu: rustc: Fix process test.

* gnu/packages/rust.scm (rustc)[arguments]: Rename 'patch-lockfile-test
to 'patch-tests.  Add another substitution.

patch browse .tar.gz

1 files changed, 6 insertions(+), 3 deletions(-)

M gnu/packages/rust.scm

M gnu/packages/rust.scm => gnu/packages/rust.scm +6 -3

@@ 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"))