~ruther/guix-local: build/cargo: Unconditionally use system gettext.

a51c34a22a54d213119065e780f1b3825bca04bb — Hilton Chain 1 year, 1 month ago 99dbcf8

build/cargo: Unconditionally use system gettext.

No special value is required for this environment variable.

* guix/build/cargo-build-system.scm (configure): Set GETTEXT_SYSTEM
unconditionally.

Change-Id: Id40fecaf75fa76c7b7f1404db226fa1ca6a45a5e

patch browse .tar.gz

1 files changed, 1 insertions(+), 2 deletions(-)

M guix/build/cargo-build-system.scm

M guix/build/cargo-build-system.scm => guix/build/cargo-build-system.scm +1 -2

@@ 248,6 248,7 @@ directory = '" vendor-dir "'") port)
       (setenv "TARGET_PKG_CONFIG" (string-append target "-pkg-config")))
     (setenv "CC" (string-append (assoc-ref inputs "gcc") "/bin/gcc")))
 
+  (setenv "GETTEXT_SYSTEM" "1")
   (setenv "LIBGIT2_SYS_USE_PKG_CONFIG" "1")
   (setenv "LIBSQLITE3_SYS_USE_PKG_CONFIG" "1")
   (setenv "LIBSSH2_SYS_USE_PKG_CONFIG" "1")


@@ 256,8 257,6 @@ directory = '" vendor-dir "'") port)
   (setenv "ZSTD_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")))