mirror of
https://codeberg.org/guix/guix.git
synced 2025-10-02 02:15:12 +00:00
build-system/cargo: Set openssl environment variable when available.
* guix/build/cargo-build-system.scm (configure): When openssl is available set the OPENSSL_DIR variable to discover its location. * gnu/packages/crates-io.scm (rust-curl-sys-0.4, rust-libgit2-sys-0.10, rust-libpijul-0.12, rust-libssh2-sys-0.2, rust-native-tls-0.2, rust-openssl-sys-0.9, rust-openssl-0.7, rust-trust-dns-rustls-0.6), * gnu/packages/rust-apps.scm (tokei, exa)[arguments]: Remove redundant setenv for openssl.
This commit is contained in:
parent
93b14be52e
commit
3dbf3a7f51
3 changed files with 30 additions and 84 deletions
|
@ -73,13 +73,7 @@
|
|||
("rust-zoneinfo-compiled" ,rust-zoneinfo-compiled-0.4))
|
||||
#:cargo-development-inputs
|
||||
(("rust-datetime" ,rust-datetime-0.4))
|
||||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
(add-after 'configure 'dont-vendor-sources
|
||||
(lambda* (#:key inputs #:allow-other-keys)
|
||||
(let ((openssl (assoc-ref inputs "openssl")))
|
||||
(setenv "OPENSSL_DIR" openssl))
|
||||
#t))
|
||||
;; Ignoring failing tests.
|
||||
;; Reported in https://github.com/ogham/exa/issues/318
|
||||
(add-before 'check 'disable-failing-tests
|
||||
|
@ -393,18 +387,12 @@ gitignore rules.")
|
|||
("rust-lazy-static" ,rust-lazy-static-1)
|
||||
("rust-regex" ,rust-regex-1)
|
||||
("rust-serde-json" ,rust-serde-json-1)
|
||||
("rust-tempfile" ,rust-tempfile-3))
|
||||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
(add-after 'configure 'unvendor-libraries-from-crates
|
||||
(lambda* (#:key inputs #:allow-other-keys)
|
||||
(let ((openssl (assoc-ref inputs "openssl")))
|
||||
(setenv "OPENSSL_DIR" openssl))
|
||||
#t)))))
|
||||
("rust-tempfile" ,rust-tempfile-3))))
|
||||
(native-inputs
|
||||
`(("pkg-config" ,pkg-config)))
|
||||
(inputs
|
||||
`(("libgit2" ,libgit2)
|
||||
("openssl" ,openssl)
|
||||
("pkg-config" ,pkg-config)
|
||||
("zlib" ,zlib)))
|
||||
(home-page "https://tokei.rs")
|
||||
(synopsis "Count code, quickly")
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue