guix_mirror_bot pushed a commit to branch gnome-team
in repository guix.

commit 24292e05d16a1e4dcbf9331147444ef8cce72a37
Author: Hilton Chain <[email protected]>
AuthorDate: Mon Apr 7 23:35:39 2025 +0800

    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
---
 guix/build/cargo-build-system.scm | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/guix/build/cargo-build-system.scm 
b/guix/build/cargo-build-system.scm
index a09e864447..8273ac4ed0 100644
--- a/guix/build/cargo-build-system.scm
+++ b/guix/build/cargo-build-system.scm
@@ -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")))

Reply via email to