diff options
| author | Efraim Flashner <efraim@flashner.co.il> | 2023-04-18 10:05:48 +0300 |
|---|---|---|
| committer | Efraim Flashner <efraim@flashner.co.il> | 2023-05-07 19:29:33 +0300 |
| commit | 163c1a84d116e963065300cd3f20349b67e155e3 (patch) | |
| tree | 70a2ef9f2289b12ea2b9c4a1760b21c5e63d03c2 | |
| parent | e7ae9909fe28eef36ce919213e5884c459ec0fb7 (diff) | |
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.
| -rw-r--r-- | gnu/packages/rust-apps.scm | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/gnu/packages/rust-apps.scm b/gnu/packages/rust-apps.scm index 0b1f7b8bf4..8c29969712 100644 --- a/gnu/packages/rust-apps.scm +++ b/gnu/packages/rust-apps.scm @@ -924,6 +924,8 @@ browsers.") (build-system cargo-build-system) (arguments `(#:install-source? #f + ;; error[E0463]: can't find crate for `cargo_test_macro` + #:tests? #f #:cargo-inputs (("rust-anyhow" ,rust-anyhow-1) ("rust-cargo-metadata" ,rust-cargo-metadata-0.15) @@ -954,11 +956,17 @@ browsers.") ("rust-predicates" ,rust-predicates-2) ("rust-snapbox" ,rust-snapbox-0.2) ("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 - (list pkg-config)) + (list perl pkg-config)) (inputs - (list libgit2 + (list libgit2-1.4 libssh2 openssl zlib)) |