me
/
guix
Archived
1
0
Fork 0
Code

build-system/cargo: Don't clobber packaged crates while building. 

This fixes an issue where two packages share a common dependent.

* guix/build/cargo-build-system.scm (unpack-rust-crates): Only copy rust
crates into the target directory if there isn't one already there with
the same name.
master
Efraim Flashner 2021-03-15 13:04:46 +02:00
parent bf612ead76
commit 78e7e178a3
No known key found for this signature in database
GPG Key ID: 41AAE7DCCA3D8351
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
guix/build/cargo-build-system.scm
View File

@ -91,11 +91,17 @@ Cargo.toml file present at its root."
(mkdir-p "target/package")
(mkdir-p vendor-dir)
;; TODO: copy only regular inputs to target/package, not native-inputs.
(for-each (lambda (input-crate)
(copy-recursively (string-append input-crate
"/share/cargo/registry")
"target/package"))
(delete-duplicates rust-inputs))
(for-each
(lambda (input-crate)
(for-each
(lambda (packaged-crate)
(unless
(file-exists?
(string-append "target/package/" (basename packaged-crate)))
(install-file packaged-crate "target/package/")))
(find-files
(string-append input-crate "/share/cargo/registry") "\\.crate$")))
(delete-duplicates rust-inputs))
(for-each (lambda (crate)
(invoke "tar" "xzf" crate "-C" vendor-dir))