diff options
| author | Mark H Weaver <mhw@netris.org> | 2018-05-21 13:22:32 -0400 |
|---|---|---|
| committer | Mark H Weaver <mhw@netris.org> | 2018-05-21 13:22:32 -0400 |
| commit | 0661758e133c0384d20043d3526b5ebc794e1f04 (patch) | |
| tree | 46fb6d731fd0e562379ecfffba499deb17847a23 /gnu/packages/rust.scm | |
| parent | 539bf8f2c071b53834829259bb3fabf0390c5dc6 (diff) | |
| parent | c036959b1a61c37c9b7d72e655e1441f2feefb6e (diff) | |
| download | guix-patches-0661758e133c0384d20043d3526b5ebc794e1f04.tar guix-patches-0661758e133c0384d20043d3526b5ebc794e1f04.tar.gz | |
Merge branch 'master' into core-updates
Diffstat (limited to 'gnu/packages/rust.scm')
| -rw-r--r-- | gnu/packages/rust.scm | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/gnu/packages/rust.scm b/gnu/packages/rust.scm index bf50cdd55e..6c6e91a2fb 100644 --- a/gnu/packages/rust.scm +++ b/gnu/packages/rust.scm @@ -272,8 +272,8 @@ safety and thread safety guarantees.") (package-native-inputs base-rust)))))) (define-public mrustc - (let ((commit "4f98e4322ef7aabd3bbef8cd93c0980cd6eeeed1") - (revision "1") + (let ((commit "ee65f12f4aeb27238c8a2fc07fbe84eceafdde26") + (revision "2") (rustc-version "1.19.0")) (package (name "mrustc") @@ -286,7 +286,7 @@ safety and thread safety guarantees.") (file-name (git-file-name name version)) (sha256 (base32 - "1hk1x2iv64il5g2n3z06d6h219hnxg1w84lj7vi1lydqa65qk92p")))) + "0rdjzxfwhrpzf44afpm0i7b8fiqvriccn93z22sys8pxw22pkp0d")))) (outputs '("out" "cargo")) (build-system gnu-build-system) (inputs @@ -320,7 +320,10 @@ safety and thread safety guarantees.") (invoke "patch" "-p0" "../rust_src.patch") (chdir "..") #t)) - (delete 'configure) + (replace 'configure + (lambda* (#:key inputs #:allow-other-keys) + (setenv "CC" (string-append (assoc-ref inputs "gcc") "/bin/gcc")) + #t)) (add-after 'build 'build-minicargo (lambda _ (for-each (lambda (target) |