me/guix
Archived
1
0
Fork 0
Code Activity

gnu: rust-libssh2-sys-0.2: Remove vendored code.

Browse source 
* 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.
This commit is contained in:
Efraim Flashner 2020-01-25 21:48:37 +02:00
parent e2302953d5
commit ad03f50fa8
No known key found for this signature in database
GPG key ID: 41AAE7DCCA3D8351
2 changed files with 5 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
gnu/packages/crates-io.scm
View file

@ -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-" (string-append "guix-vendor/rust-libz-sys-"
,(package-version rust-libz-sys-1.0) ,(package-version rust-libz-sys-1.0)
".crate/src/zlib")) ".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 "LIBGIT2_SYS_USE_PKG_CONFIG" "1")
(setenv "LIBSSH2_SYS_USE_PKG_CONFIG" "1") (setenv "LIBSSH2_SYS_USE_PKG_CONFIG" "1")
#t))))) #t)))))
@ -5716,10 +5712,13 @@ functions and static variables these libraries contain.")
(origin (origin
(method url-fetch) (method url-fetch)
(uri (crate-uri "libssh2-sys" version)) (uri (crate-uri "libssh2-sys" version))
(file-name (string-append name "-" version ".crate")) (file-name (string-append name "-" version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"042gsgbvxgm5by4mk906j3zm4qdvzcfhjxrb55is1lrr6f0nxain")))) "042gsgbvxgm5by4mk906j3zm4qdvzcfhjxrb55is1lrr6f0nxain"))
(modules '((guix build utils)))
(snippet
'(begin (delete-file-recursively "libssh2") #t))))
(build-system cargo-build-system) (build-system cargo-build-system)
(arguments (arguments
`(#:skip-build? #t ; it wants rust-openssl-src `(#: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) (lambda* (#:key inputs #:allow-other-keys)
(let ((openssl (assoc-ref inputs "openssl"))) (let ((openssl (assoc-ref inputs "openssl")))
(setenv "OPENSSL_DIR" 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 (delete-file-recursively
(string-append "guix-vendor/rust-libz-sys-" (string-append "guix-vendor/rust-libz-sys-"
,(package-version rust-libz-sys-1.0) ,(package-version rust-libz-sys-1.0)

4
gnu/packages/rust-apps.scm
View file

@ -146,10 +146,6 @@ gitignore rules.")
(setenv "OPENSSL_DIR" openssl) (setenv "OPENSSL_DIR" openssl)
(setenv "LIBGIT2_SYS_USE_PKG_CONFIG" "1") (setenv "LIBGIT2_SYS_USE_PKG_CONFIG" "1")
(setenv "LIBSSH2_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 (delete-file-recursively
(string-append "guix-vendor/rust-libz-sys-" (string-append "guix-vendor/rust-libz-sys-"
,(package-version rust-libz-sys-1.0) ,(package-version rust-libz-sys-1.0)