guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

01/01: gnu: rustc: Fix process test.


From: Danny Milosavljevic
Subject: 01/01: gnu: rustc: Fix process test.
Date: Sat, 18 Mar 2017 05:37:16 -0400 (EDT)

dannym pushed a commit to branch master
in repository guix.

commit 84aac61c819cf2c82d8d4b54cdf53ed9e713a82f
Author: Danny Milosavljevic <address@hidden>
Date:   Sat Mar 18 10:31:26 2017 +0100

    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(-)

diff --git a/gnu/packages/rust.scm b/gnu/packages/rust.scm
index efac79c..2dedef8 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"))



reply via email to

[Prev in Thread] Current Thread [Next in Thread]