summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gnu/packages/rust.scm9
1 files changed, 6 insertions, 3 deletions
diff --git a/gnu/packages/rust.scm b/gnu/packages/rust.scm
index e60c209eaf7..7f854022421 100644
--- a/gnu/packages/rust.scm
+++ b/gnu/packages/rust.scm
@@ -1418,10 +1418,10 @@ exec -a \"$0\" \"~a\" \"$@\""
1418 #~(modify-phases #$phases 1418 #~(modify-phases #$phases
1419 (add-after 'unpack 'unbundle-xz 1419 (add-after 'unpack 'unbundle-xz
1420 (lambda _ 1420 (lambda _
1421 (delete-file-recursively "vendor/lzma-sys/xz-5.2") 1421 (delete-file-recursively "vendor/lzma-sys-0.1.20/xz-5.2")
1422 ;; Remove the option of using the static library. 1422 ;; Remove the option of using the static library.
1423 ;; This is necessary for building the sysroot. 1423 ;; This is necessary for building the sysroot.
1424 (substitute* "vendor/lzma-sys/build.rs" 1424 (substitute* "vendor/lzma-sys-0.1.20/build.rs"
1425 (("!want_static && ") "")))) 1425 (("!want_static && ") ""))))
1426 #$@(if (target-mingw? target) 1426 #$@(if (target-mingw? target)
1427 `((add-after 'set-env 'patch-for-mingw 1427 `((add-after 'set-env 'patch-for-mingw
@@ -1446,7 +1446,9 @@ exec -a \"$0\" \"~a\" \"$@\""
1446 ":")) 1446 ":"))
1447 ;; When building a rust-sysroot this crate is only used for 1447 ;; When building a rust-sysroot this crate is only used for
1448 ;; the rust-installer. 1448 ;; the rust-installer.
1449 (substitute* "vendor/num_cpus/src/linux.rs" 1449 (substitute* '("vendor/num_cpus-1.13.0/src/linux.rs"
1450 "vendor/num_cpus-1.13.1/src/linux.rs"
1451 "vendor/num_cpus-1.16.0/src/linux.rs")
1450 (("\\.ceil\\(\\)") "")) 1452 (("\\.ceil\\(\\)") ""))
1451 ;; gcc doesn't recognize this flag. 1453 ;; gcc doesn't recognize this flag.
1452 (substitute* 1454 (substitute*
@@ -1536,6 +1538,7 @@ ar = \"" (search-input-file inputs (string-append "/bin/" #$(ar-for-target targe
1536 (replace 'install 1538 (replace 'install
1537 (lambda _ 1539 (lambda _
1538 (invoke "./x.py" "install" "library/std"))) 1540 (invoke "./x.py" "install" "library/std")))
1541 (delete 'enable-profiling)
1539 (delete 'install-rust-src) 1542 (delete 'install-rust-src)
1540 (delete 'wrap-rust-analyzer) 1543 (delete 'wrap-rust-analyzer)
1541 (delete 'wrap-rustc))))) 1544 (delete 'wrap-rustc)))))