me
/
guix
Archived
1
0
Fork 0
Code

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.
master
Efraim Flashner 2020-01-25 21:53:44 +02:00
parent bba73d473a
commit d6dde77d7f
No known key found for this signature in database
GPG Key ID: 41AAE7DCCA3D8351
2 changed files with 7 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
gnu/packages/crates-io.scm
View File

@ -5624,10 +5624,6 @@ values of all the exported APIs match the platform that libc is compiled for.")
(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
(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 "LIBGIT2_SYS_USE_PKG_CONFIG" "1")
(setenv "LIBSSH2_SYS_USE_PKG_CONFIG" "1") (setenv "LIBSSH2_SYS_USE_PKG_CONFIG" "1")
#t))))) #t)))))
@ -5736,10 +5732,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
(string-append "guix-vendor/rust-libz-sys-"
,(package-version rust-libz-sys-1.0)
".crate/src/zlib"))
(setenv "LIBSSH2_SYS_USE_PKG_CONFIG" "1") (setenv "LIBSSH2_SYS_USE_PKG_CONFIG" "1")
#t))))) #t)))))
(native-inputs (native-inputs
@ -6574,10 +6566,13 @@ types as proposed in RFC 1158.")
(origin (origin
(method url-fetch) (method url-fetch)
(uri (crate-uri "libz-sys" version)) (uri (crate-uri "libz-sys" version))
(file-name (string-append name "-" version ".crate")) (file-name (string-append name "-" version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"1gjycyl2283525abks98bhxa4r259m617xfm5z52p3p3c8ry9d9f")))) "1gjycyl2283525abks98bhxa4r259m617xfm5z52p3p3c8ry9d9f"))
(modules '((guix build utils)))
(snippet
'(begin (delete-file-recursively "src/zlib") #t))))
(build-system cargo-build-system) (build-system cargo-build-system)
(arguments (arguments
`(#:cargo-inputs `(#:cargo-inputs
@ -6585,17 +6580,7 @@ types as proposed in RFC 1158.")
;; Build dependencies: ;; Build dependencies:
("rust-cc" ,rust-cc-1.0) ("rust-cc" ,rust-cc-1.0)
("rust-pkg-config" ,rust-pkg-config-0.3) ("rust-pkg-config" ,rust-pkg-config-0.3)
("rust-vcpkg" ,rust-vcpkg-0.2)) ("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)))))
(native-inputs (native-inputs
`(("pkg-config" ,pkg-config) `(("pkg-config" ,pkg-config)
("zlib" ,zlib))) ("zlib" ,zlib)))

6
gnu/packages/rust-apps.scm
View File

@ -145,11 +145,7 @@ gitignore rules.")
(let ((openssl (assoc-ref inputs "openssl"))) (let ((openssl (assoc-ref inputs "openssl")))
(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-libz-sys-"
,(package-version rust-libz-sys-1.0)
".crate/src/zlib")))
#t))))) #t)))))
(native-inputs (native-inputs
`(("libgit2" ,libgit2) `(("libgit2" ,libgit2)