build: cargo-build-system: Add pkg-config environment variables.
* guix/build/cargo-build-system.scm (configure): Add environment variables to use system libgit2 and libssh2. * gnu/packages/crates-io.scm (rust-libgit2-sys-0.10, rust-libssh2-sys-0.2)[arguments]: Remove LIBGIT2 and LIBSSH2 environment variable settings. * gnu/packages/rust-apps.scm (tokei)[arguments]: Same.
This commit is contained in:
parent
d0c4d1abfe
commit
61b95c15cf
|
@ -5626,8 +5626,6 @@ (define-public rust-libgit2-sys-0.10
|
||||||
(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))
|
||||||
(setenv "LIBGIT2_SYS_USE_PKG_CONFIG" "1")
|
|
||||||
(setenv "LIBSSH2_SYS_USE_PKG_CONFIG" "1")
|
|
||||||
#t)))))
|
#t)))))
|
||||||
(native-inputs
|
(native-inputs
|
||||||
`(("libgit2" ,libgit2)
|
`(("libgit2" ,libgit2)
|
||||||
|
@ -5734,7 +5732,6 @@ (define-public rust-libssh2-sys-0.2
|
||||||
(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))
|
||||||
(setenv "LIBSSH2_SYS_USE_PKG_CONFIG" "1")
|
|
||||||
#t)))))
|
#t)))))
|
||||||
(native-inputs
|
(native-inputs
|
||||||
`(("libssh2" ,libssh2)
|
`(("libssh2" ,libssh2)
|
||||||
|
|
|
@ -143,9 +143,7 @@ (define-public tokei
|
||||||
(add-after 'configure 'unvendor-libraries-from-crates
|
(add-after 'configure 'unvendor-libraries-from-crates
|
||||||
(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))
|
||||||
(setenv "LIBGIT2_SYS_USE_PKG_CONFIG" "1")
|
|
||||||
(setenv "LIBSSH2_SYS_USE_PKG_CONFIG" "1"))
|
|
||||||
#t)))))
|
#t)))))
|
||||||
(native-inputs
|
(native-inputs
|
||||||
`(("libgit2" ,libgit2)
|
`(("libgit2" ,libgit2)
|
||||||
|
|
|
@ -119,6 +119,8 @@ (define* (configure #:key inputs
|
||||||
;; upgrading the compiler for example.
|
;; upgrading the compiler for example.
|
||||||
(setenv "RUSTFLAGS" "--cap-lints allow")
|
(setenv "RUSTFLAGS" "--cap-lints allow")
|
||||||
(setenv "CC" (string-append (assoc-ref inputs "gcc") "/bin/gcc"))
|
(setenv "CC" (string-append (assoc-ref inputs "gcc") "/bin/gcc"))
|
||||||
|
(setenv "LIBGIT2_SYS_USE_PKG_CONFIG" "1")
|
||||||
|
(setenv "LIBSSH2_SYS_USE_PKG_CONFIG" "1")
|
||||||
|
|
||||||
;; We don't use the Cargo.lock file to determine the package versions we use
|
;; We don't use the Cargo.lock file to determine the package versions we use
|
||||||
;; during building, and in any case if one is not present it is created
|
;; during building, and in any case if one is not present it is created
|
||||||
|
|
Loading…
Reference in a new issue