From 9ba78f3ccfe92d409a7126133d32e977e6fcd52b Mon Sep 17 00:00:00 2001
From: Hilton Chain <hako@ultrarare.space>
Date: Mon, 3 Mar 2025 23:47:10 +0800
Subject: build/cargo: Don't vendor self.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* guix/build/cargo-build-system.scm (crate-src?, configure): Exclude self.
* gnu/packages/gnome.scm (librsvg)[#:phases]: Remove ‘dont-vendor-self’.
* gnu/packages/python-crypto.scm (python-cryptography)[#:arguments]: Likewise.
* gnu/packages/python-xyz.scm (python-libcst)[#:arguments]: Likewise.
* gnu/packages/syndication.scm (newsboat)[#:arguments]: Likewise.
* gnu/packages/antivirus.scm (clamav)[#:arguments]: Likewise.

Change-Id: I5e01721fb705937f5fcf858c21b6d7e27ade6c10
---
 gnu/packages/antivirus.scm     | 5 +----
 gnu/packages/gnome.scm         | 5 -----
 gnu/packages/python-crypto.scm | 5 -----
 gnu/packages/python-xyz.scm    | 5 -----
 gnu/packages/syndication.scm   | 5 -----
 5 files changed, 1 insertion(+), 24 deletions(-)

(limited to 'gnu')

diff --git a/gnu/packages/antivirus.scm b/gnu/packages/antivirus.scm
index 4a01115abd..d2060fa385 100644
--- a/gnu/packages/antivirus.scm
+++ b/gnu/packages/antivirus.scm
@@ -116,10 +116,7 @@
           (add-after 'configure 'fix-cargo-inputs-vendoring
             (lambda _
               ;; Reproduce the original layout, fails with config.
-              (rename-file ".cargo/config" ".cargo/config.toml")
-              ;; Wrongly placed by configure
-              (delete-file-recursively
-               (string-append ".cargo/vendor/clamav-" #$version ".tar.zst"))))
+              (rename-file ".cargo/config" ".cargo/config.toml")))
           (add-after 'patch-cargo-checksums 'cmake-configure
             (lambda* (#:key outputs #:allow-other-keys)
               ((assoc-ref cmake:%standard-phases 'configure)
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 97ad6e9d69..e760e4bcc8 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -3807,11 +3807,6 @@ for dealing with different structured file formats.")
                                      "--host=" #$(%current-target-system)))
                                 #~("--enable-vala")))
                      args)))
-          (add-after 'configure 'dont-vendor-self
-            (lambda* (#:key vendor-dir #:allow-other-keys)
-              ;; Don't keep the whole tarball in the vendor directory
-              (delete-file-recursively
-               (string-append vendor-dir "/" #$name "-" #$version ".tar.xz"))))
           (replace 'build
             (assoc-ref gnu:%standard-phases 'build))
           (replace 'check
diff --git a/gnu/packages/python-crypto.scm b/gnu/packages/python-crypto.scm
index 8887da9e00..8f413b45e1 100644
--- a/gnu/packages/python-crypto.scm
+++ b/gnu/packages/python-crypto.scm
@@ -561,11 +561,6 @@ is used by the Requests library to verify HTTPS requests.")
       #:install-source? #false
       #:phases
       #~(modify-phases %standard-phases
-          (add-after 'configure 'dont-vendor-self
-            (lambda* (#:key vendor-dir #:allow-other-keys)
-              ;; Don't keep the whole tarball in the vendor directory
-              (delete-file-recursively
-               (string-append vendor-dir "/cryptography-" #$version ".tar.zst"))))
           (replace 'build
             (assoc-ref py:%standard-phases 'build))
           (delete 'check)
diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 2ab52e82c2..09ee938973 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -23742,11 +23742,6 @@ members = [
           (add-after 'unpack 'prepare-source
             (lambda _
               (delete-file "native/Cargo.lock")))
-          (add-after 'configure 'dont-vendor-self
-            (lambda* (#:key vendor-dir #:allow-other-keys)
-              ;; Don't keep the whole tarball in the vendor directory
-              (delete-file-recursively
-                (string-append vendor-dir "/libcst-" #$version ".tar.zst"))))
           (replace 'build
             (assoc-ref py:%standard-phases 'build))
           (add-after 'install 'wrap
diff --git a/gnu/packages/syndication.scm b/gnu/packages/syndication.scm
index 30a1370c6d..d6bb6be749 100644
--- a/gnu/packages/syndication.scm
+++ b/gnu/packages/syndication.scm
@@ -312,11 +312,6 @@ cards.")
                  (("if curl-config")
                   (string-append
                     "if " (search-input-file inputs "/bin/curl-config"))))))
-           (add-after 'configure 'dont-vendor-self
-             (lambda* (#:key vendor-dir #:allow-other-keys)
-               ;; Don't keep the whole tarball in the vendor directory
-               (delete-file-recursively
-                 (string-append vendor-dir "/" #$name "-" #$version ".tar.xz"))))
            (add-after 'unpack 'patch-source
              (lambda* (#:key outputs #:allow-other-keys)
                (substitute* "Makefile"
-- 
cgit v1.3