diff options
| author | Efraim Flashner <efraim@flashner.co.il> | 2020-11-22 19:29:32 +0200 |
|---|---|---|
| committer | Efraim Flashner <efraim@flashner.co.il> | 2020-11-22 19:45:43 +0200 |
| commit | 1ca0c348674dd4dec2ccb5a2d79b4cfd03a631ef (patch) | |
| tree | 7475fa98068e861dad8a8d7707b7997bd0d205e5 /guix/build | |
| parent | 8aae54f46b74cea11fc0606ca8272e8b1a1b3e9c (diff) | |
| download | guix-patches-1ca0c348674dd4dec2ccb5a2d79b4cfd03a631ef.tar guix-patches-1ca0c348674dd4dec2ccb5a2d79b4cfd03a631ef.tar.gz | |
build-system/cargo: Set gettext environment variable when available.
* guix/build/cargo-build-system.scm (configure): When gettext is
available in the build environment set the GETTEXT_SYSTEM variable.
* gnu/packages/crates-io.scm (rust-gettext-rs-0.5, rust-gettext-rs-0.4,
rust-gettext-sys-0.19)[arguments]: Remove phase to help find system gettext.
Diffstat (limited to 'guix/build')
| -rw-r--r-- | guix/build/cargo-build-system.scm | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/guix/build/cargo-build-system.scm b/guix/build/cargo-build-system.scm index 8c0268906e..a638d0eded 100644 --- a/guix/build/cargo-build-system.scm +++ b/guix/build/cargo-build-system.scm @@ -124,6 +124,8 @@ directory = '" port) (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"))) |