04/08: gnu: rust-libssh2-sys-0.2: Remove vendored code.

[guix-commits]

efraim pushed a commit to branch master
in repository guix.

commit ad03f50fa80c0a5306de6b3efbd152bcf281164d
Author: Efraim Flashner <address@hidden>
AuthorDate: Sat Jan 25 21:48:37 2020 +0200

    gnu: rust-libssh2-sys-0.2: Remove vendored code.
    
    * gnu/packages/crates-io.scm (rust-libssh2-sys-0.2)[source]: Remove
    vendored code.
    [arguments]: Don't remove missing vendored code.
    (rust-libgit2-sys-0.10)[arguments]: Same.
    * gnu/packages/rust-apps.scm (tokei)[arguments]: Same.
---
 gnu/packages/crates-io.scm | 16 +++++-----------
 gnu/packages/rust-apps.scm |  4 ----
 2 files changed, 5 insertions(+), 15 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index ea4a3f3..8ba8cde 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -5628,10 +5628,6 @@ values of all the exported APIs match the platform that 
libc is compiled for.")
                (string-append "guix-vendor/rust-libz-sys-"
                               ,(package-version rust-libz-sys-1.0)
                               ".crate/src/zlib"))
-             (delete-file-recursively
-               (string-append "guix-vendor/rust-libssh2-sys-"
-                              ,(package-version rust-libssh2-sys-0.2)
-                              ".crate/libssh2"))
              (setenv "LIBGIT2_SYS_USE_PKG_CONFIG" "1")
              (setenv "LIBSSH2_SYS_USE_PKG_CONFIG" "1")
              #t)))))
@@ -5716,10 +5712,13 @@ functions and static variables these libraries 
contain.")
       (origin
         (method url-fetch)
         (uri (crate-uri "libssh2-sys" version))
-        (file-name (string-append name "-" version ".crate"))
+        (file-name (string-append name "-" version ".tar.gz"))
         (sha256
          (base32
-          "042gsgbvxgm5by4mk906j3zm4qdvzcfhjxrb55is1lrr6f0nxain"))))
+          "042gsgbvxgm5by4mk906j3zm4qdvzcfhjxrb55is1lrr6f0nxain"))
+        (modules '((guix build utils)))
+        (snippet
+         '(begin (delete-file-recursively "libssh2") #t))))
     (build-system cargo-build-system)
     (arguments
      `(#:skip-build? #t ; it wants rust-openssl-src
@@ -5737,11 +5736,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 "libssh2")
-             (delete-file-recursively
-               (string-append "guix-vendor/rust-libssh2-sys-"
-                              ,(package-version rust-libssh2-sys-0.2)
-                              ".crate/libssh2"))
              (delete-file-recursively
                (string-append "guix-vendor/rust-libz-sys-"
                               ,(package-version rust-libz-sys-1.0)
diff --git a/gnu/packages/rust-apps.scm b/gnu/packages/rust-apps.scm
index 1b0721f..2099e38 100644
--- a/gnu/packages/rust-apps.scm
+++ b/gnu/packages/rust-apps.scm
@@ -147,10 +147,6 @@ gitignore rules.")
                (setenv "LIBGIT2_SYS_USE_PKG_CONFIG" "1")
                (setenv "LIBSSH2_SYS_USE_PKG_CONFIG" "1")
                (delete-file-recursively
-                 (string-append "guix-vendor/rust-libssh2-sys-"
-                                ,(package-version rust-libssh2-sys-0.2)
-                                ".crate/libssh2"))
-               (delete-file-recursively
                  (string-append "guix-vendor/rust-libz-sys-"
                                 ,(package-version rust-libz-sys-1.0)
                                 ".crate/src/zlib")))