TakeV/guix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

gnu: rust-libgit2-sys-0.10: Remove vendored code.

Browse source 
* gnu/packages/crates-io.scm (rust-libgit2-sys-0.10)[source]: Remove
vendored code.
[arguments]: Don't remove missing vendored code.
* gnu/packages/rust-apps.scm (tokei)[arguments]: Same.
This commit is contained in:
Efraim Flashner 2020-01-25 21:41:44 +02:00
parent a13db7e2ab
commit 0173e69f52
No known key found for this signature in database
GPG key ID: 41AAE7DCCA3D8351
2 changed files with 5 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -5603,10 +5603,13 @@ (define-public rust-libgit2-sys-0.10
(origin
(method url-fetch)
(uri (crate-uri "libgit2-sys" version))
(file-name (string-append name "-" version ".crate"))
(file-name (string-append name "-" version ".tar.gz"))
(sha256
(base32
"0l9fvki7qxsl97vgzqwlv75nl213a5vxw7b1jaik97ala356pv6r"))))
"0l9fvki7qxsl97vgzqwlv75nl213a5vxw7b1jaik97ala356pv6r"))
(modules '((guix build utils)))
(snippet
'(begin (delete-file-recursively "libgit2") #t))))
(build-system cargo-build-system)
(arguments
`(#:cargo-inputs
@ -5623,11 +5626,6 @@ (define-public rust-libgit2-sys-0.10
(lambda* (#:key inputs #:allow-other-keys)
(let ((openssl (assoc-ref inputs "openssl")))
(setenv "OPENSSL_DIR" openssl))
(delete-file-recursively "libgit2")
(delete-file-recursively
(string-append "guix-vendor/rust-libgit2-sys-"
,(package-version rust-libgit2-sys-0.10)
".crate/libgit2"))
(delete-file-recursively
(string-append "guix-vendor/rust-libz-sys-"
,(package-version rust-libz-sys-1.0)

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

@ -146,10 +146,6 @@ (define-public tokei
(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-libgit2-sys-"
,(package-version rust-libgit2-sys-0.10)
".crate/libgit2"))
(delete-file-recursively
(string-append "guix-vendor/rust-libssh2-sys-"
,(package-version rust-libssh2-sys-0.2)