gnu: rust-cargo-edit: Fix build.
* gnu/packages/rust-apps.scm (rust-cargo-edit)[arguments]: Skip tests. Add a phase to not default to vendored libgit2. [native-inputs]: Add perl. [inputs]: Replace libgit2 with libgit2-1.4.
This commit is contained in:
parent
e7ae9909fe
commit
163c1a84d1
1 changed files with 11 additions and 3 deletions
|
@ -924,6 +924,8 @@ browsers.")
|
||||||
(build-system cargo-build-system)
|
(build-system cargo-build-system)
|
||||||
(arguments
|
(arguments
|
||||||
`(#:install-source? #f
|
`(#:install-source? #f
|
||||||
|
;; error[E0463]: can't find crate for `cargo_test_macro`
|
||||||
|
#:tests? #f
|
||||||
#:cargo-inputs
|
#:cargo-inputs
|
||||||
(("rust-anyhow" ,rust-anyhow-1)
|
(("rust-anyhow" ,rust-anyhow-1)
|
||||||
("rust-cargo-metadata" ,rust-cargo-metadata-0.15)
|
("rust-cargo-metadata" ,rust-cargo-metadata-0.15)
|
||||||
|
@ -954,11 +956,17 @@ browsers.")
|
||||||
("rust-predicates" ,rust-predicates-2)
|
("rust-predicates" ,rust-predicates-2)
|
||||||
("rust-snapbox" ,rust-snapbox-0.2)
|
("rust-snapbox" ,rust-snapbox-0.2)
|
||||||
("rust-trycmd" ,rust-trycmd-0.13)
|
("rust-trycmd" ,rust-trycmd-0.13)
|
||||||
("rust-url" ,rust-url-2))))
|
("rust-url" ,rust-url-2))
|
||||||
|
#:phases
|
||||||
|
(modify-phases %standard-phases
|
||||||
|
(add-after 'unpack 'dont-default-to-vendored-libgit2
|
||||||
|
(lambda _
|
||||||
|
(substitute* "Cargo.toml"
|
||||||
|
((".*\"vendored-libgit2\".*") "")))))))
|
||||||
(native-inputs
|
(native-inputs
|
||||||
(list pkg-config))
|
(list perl pkg-config))
|
||||||
(inputs
|
(inputs
|
||||||
(list libgit2
|
(list libgit2-1.4
|
||||||
libssh2
|
libssh2
|
||||||
openssl
|
openssl
|
||||||
zlib))
|
zlib))
|
||||||
|
|
Reference in a new issue