diff options
| author | Marius Bakke <marius@gnu.org> | 2020-11-22 23:36:09 +0100 |
|---|---|---|
| committer | Marius Bakke <marius@gnu.org> | 2020-11-22 23:36:09 +0100 |
| commit | a485a98ca8296d760251e9d870583117ac50979e (patch) | |
| tree | 792df6983c0e52403a6c3b82c804f295369a9b1d /guix/build | |
| parent | 84d1b500f078b619daba35864c703890bd91e5c2 (diff) | |
| parent | 1ca0c348674dd4dec2ccb5a2d79b4cfd03a631ef (diff) | |
Merge branch 'master' into staging
Diffstat (limited to 'guix/build')
| -rw-r--r-- | guix/build/cargo-build-system.scm | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/guix/build/cargo-build-system.scm b/guix/build/cargo-build-system.scm index 73493af551..c7beffc6e4 100644 --- a/guix/build/cargo-build-system.scm +++ b/guix/build/cargo-build-system.scm @@ -123,6 +123,13 @@ directory = '" port) (setenv "CC" (string-append (assoc-ref inputs "gcc") "/bin/gcc")) (setenv "LIBGIT2_SYS_USE_PKG_CONFIG" "1") (setenv "LIBSSH2_SYS_USE_PKG_CONFIG" "1") + (when (assoc-ref inputs "openssl") + (setenv "OPENSSL_DIR" (assoc-ref inputs "openssl"))) + (when (assoc-ref inputs "gettext") + (setenv "GETTEXT_SYSTEM" (assoc-ref inputs "gettext"))) + (when (assoc-ref inputs "clang") + (setenv "LIBCLANG_PATH" + (string-append (assoc-ref inputs "clang") "/lib"))) ;; 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 |