guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

385/459: gnu: rust-cargo-edit: Fix build.


From: guix-commits
Subject: 385/459: gnu: rust-cargo-edit: Fix build.
Date: Mon, 24 Apr 2023 15:04:03 -0400 (EDT)

efraim pushed a commit to branch rust-team
in repository guix.

commit e9623f0ac26ab9bdd435ce34ca764d545488f4b6
Author: Efraim Flashner <efraim@flashner.co.il>
AuthorDate: Tue Apr 18 10:05:48 2023 +0300

    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.
---
 gnu/packages/rust-apps.scm | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/rust-apps.scm b/gnu/packages/rust-apps.scm
index 1540b6ed2a..c7dfec40af 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))



reply via email to

[Prev in Thread] Current Thread [Next in Thread]