diff options
| author | Efraim Flashner <efraim@flashner.co.il> | 2022-11-29 15:08:16 +0200 |
|---|---|---|
| committer | Efraim Flashner <efraim@flashner.co.il> | 2022-11-29 15:11:52 +0200 |
| commit | 36b993cd5b7088513d771fc2140c56327555c89b (patch) | |
| tree | 6beb9a0f4e124b4046cdf3a07293c257e4761131 /gnu/packages/rust.scm | |
| parent | 9b714ec75ee74d9f5464a8a08144f27eae817cd9 (diff) | |
| download | guix-36b993cd5b7088513d771fc2140c56327555c89b.tar guix-36b993cd5b7088513d771fc2140c56327555c89b.tar.gz | |
gnu: rust-1.64: Fix building on riscv64-linux.
* gnu/packages/rust.scm (rust-1.64)[source]: Add patch and patch-flags.
(rust-1.65)[source]: Remove patch and reset patch-flags.
* gnu/packages/patches/rust-1.64-fix-riscv64-bootstrap.patch: New file.
* gnu/local.mk (dist_patch_DATA): Register it.
Diffstat (limited to 'gnu/packages/rust.scm')
| -rw-r--r-- | gnu/packages/rust.scm | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/gnu/packages/rust.scm b/gnu/packages/rust.scm index bfa5e1bc68..c0f663977a 100644 --- a/gnu/packages/rust.scm +++ b/gnu/packages/rust.scm @@ -625,6 +625,11 @@ safety and thread safety guarantees.") rust-1.63 "1.64.0" "018j720b2n12slp4xk64jc6shkncd46d621qdyzh2a8s3r49zkdk"))) (package (inherit base-rust) + (source + (origin + (inherit (package-source base-rust)) + (patches (search-patches "rust-1.64-fix-riscv64-bootstrap.patch")) + (patch-flags '("-p1" "--reverse")))) (arguments (substitute-keyword-arguments (package-arguments base-rust) ((#:phases phases) @@ -638,8 +643,16 @@ safety and thread safety guarantees.") (generate-all-checksums "vendor")))))))))) (define rust-1.65 - (rust-bootstrapped-package - rust-1.64 "1.65.0" "0f005kc0vl7qyy298f443i78ibz71hmmh820726bzskpyrkvna2q")) + (let ((base-rust + (rust-bootstrapped-package + rust-1.64 "1.65.0" "0f005kc0vl7qyy298f443i78ibz71hmmh820726bzskpyrkvna2q"))) + (package + (inherit base-rust) + (source + (origin + (inherit (package-source base-rust)) + (patches '()) + (patch-flags '("-p1"))))))) ;;; Note: Only the latest versions of Rust are supported and tested. The ;;; intermediate rusts are built for bootstrapping purposes and should not |