06/08: gnu: rust-libz-sys-1.0: Remove vendored code.

[guix-commits]

efraim pushed a commit to branch master
in repository guix.

commit d6dde77d7ff2aeb63b8b4ddbca6b518d84aa87ed
Author: Efraim Flashner <address@hidden>
AuthorDate: Sat Jan 25 21:53:44 2020 +0200

    gnu: rust-libz-sys-1.0: Remove vendored code.
    
    * gnu/packages/crates-io.scm (rust-libz-sys-1.0)[source]: Remove
    vendored code.
    [arguments]: Remove custom phase.
    (rust-libgit2-sys-0.10)[arguments]: Don't unvendor missing code.
    (rust-libssh2-sys-0.2)[arguments]: Same.
    * gnu/packages/rust-apps.scm (tokei)[arguments]: Same.
---
 gnu/packages/crates-io.scm | 27 ++++++---------------------
 gnu/packages/rust-apps.scm |  6 +-----
 2 files changed, 7 insertions(+), 26 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 144ada8..278b14e 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -5624,10 +5624,6 @@ values of all the exported APIs match the platform that 
libc is compiled for.")
            (lambda* (#:key inputs #:allow-other-keys)
              (let ((openssl (assoc-ref inputs "openssl")))
                (setenv "OPENSSL_DIR" openssl))
-             (delete-file-recursively
-               (string-append "guix-vendor/rust-libz-sys-"
-                              ,(package-version rust-libz-sys-1.0)
-                              ".crate/src/zlib"))
              (setenv "LIBGIT2_SYS_USE_PKG_CONFIG" "1")
              (setenv "LIBSSH2_SYS_USE_PKG_CONFIG" "1")
              #t)))))
@@ -5736,10 +5732,6 @@ functions and static variables these libraries contain.")
            (lambda* (#:key inputs #:allow-other-keys)
              (let ((openssl (assoc-ref inputs "openssl")))
                (setenv "OPENSSL_DIR" openssl))
-             (delete-file-recursively
-               (string-append "guix-vendor/rust-libz-sys-"
-                              ,(package-version rust-libz-sys-1.0)
-                              ".crate/src/zlib"))
              (setenv "LIBSSH2_SYS_USE_PKG_CONFIG" "1")
              #t)))))
     (native-inputs
@@ -6574,10 +6566,13 @@ types as proposed in RFC 1158.")
       (origin
         (method url-fetch)
         (uri (crate-uri "libz-sys" version))
-        (file-name (string-append name "-" version ".crate"))
+        (file-name (string-append name "-" version ".tar.gz"))
         (sha256
          (base32
-          "1gjycyl2283525abks98bhxa4r259m617xfm5z52p3p3c8ry9d9f"))))
+          "1gjycyl2283525abks98bhxa4r259m617xfm5z52p3p3c8ry9d9f"))
+        (modules '((guix build utils)))
+        (snippet
+         '(begin (delete-file-recursively "src/zlib") #t))))
     (build-system cargo-build-system)
     (arguments
      `(#:cargo-inputs
@@ -6585,17 +6580,7 @@ types as proposed in RFC 1158.")
         ;; Build dependencies:
         ("rust-cc" ,rust-cc-1.0)
         ("rust-pkg-config" ,rust-pkg-config-0.3)
-        ("rust-vcpkg" ,rust-vcpkg-0.2))
-       #:phases
-       (modify-phases %standard-phases
-         (add-after 'configure 'delete-vendored-zlib
-           (lambda _
-             (delete-file-recursively "src/zlib")
-             (delete-file-recursively
-               (string-append "guix-vendor/rust-libz-sys-"
-                              ,(package-version rust-libz-sys-1.0)
-                              ".crate/src/zlib"))
-             #t)))))
+        ("rust-vcpkg" ,rust-vcpkg-0.2))))
     (native-inputs
      `(("pkg-config" ,pkg-config)
        ("zlib" ,zlib)))
diff --git a/gnu/packages/rust-apps.scm b/gnu/packages/rust-apps.scm
index 2099e38..d9a672f 100644
--- a/gnu/packages/rust-apps.scm
+++ b/gnu/packages/rust-apps.scm
@@ -145,11 +145,7 @@ gitignore rules.")
              (let ((openssl (assoc-ref inputs "openssl")))
                (setenv "OPENSSL_DIR" openssl)
                (setenv "LIBGIT2_SYS_USE_PKG_CONFIG" "1")
-               (setenv "LIBSSH2_SYS_USE_PKG_CONFIG" "1")
-               (delete-file-recursively
-                 (string-append "guix-vendor/rust-libz-sys-"
-                                ,(package-version rust-libz-sys-1.0)
-                                ".crate/src/zlib")))
+               (setenv "LIBSSH2_SYS_USE_PKG_CONFIG" "1"))
              #t)))))
     (native-inputs
      `(("libgit2" ,libgit2)