summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEfraim Flashner <efraim@flashner.co.il>2020-11-22 19:29:32 +0200
committerEfraim Flashner <efraim@flashner.co.il>2020-11-22 19:45:43 +0200
commit1ca0c348674dd4dec2ccb5a2d79b4cfd03a631ef (patch)
tree7475fa98068e861dad8a8d7707b7997bd0d205e5
parent8aae54f46b74cea11fc0606ca8272e8b1a1b3e9c (diff)
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.
-rw-r--r--gnu/packages/crates-io.scm27
-rw-r--r--guix/build/cargo-build-system.scm2
2 files changed, 5 insertions, 24 deletions
diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 4ff6c97636..82e37a0f8d 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -10030,14 +10030,7 @@ retrieving random data from system source.")
(arguments
`(#:cargo-inputs
(("rust-gettext-sys" ,rust-gettext-sys-0.19)
- ("rust-locale-config" ,rust-locale-config-0.3))
- #:phases
- (modify-phases %standard-phases
- (add-after 'configure 'use-system-gettext
- (lambda* (#:key inputs #:allow-other-keys)
- (let ((gettext (assoc-ref inputs "gettext")))
- (setenv "GETTEXT_SYSTEM" gettext)
- #t))))))
+ ("rust-locale-config" ,rust-locale-config-0.3))))
(inputs
`(("gettext" ,gettext-minimal)))
(home-page "https://github.com/Koka/gettext-rs")
@@ -10062,14 +10055,7 @@ retrieving random data from system source.")
(arguments
`(#:cargo-inputs
(("rust-gettext-sys" ,rust-gettext-sys-0.19)
- ("rust-locale-config" ,rust-locale-config-0.2))
- #:phases
- (modify-phases %standard-phases
- (add-after 'configure 'use-system-gettext
- (lambda* (#:key inputs #:allow-other-keys)
- (let ((gettext (assoc-ref inputs "gettext")))
- (setenv "GETTEXT_SYSTEM" gettext)
- #t))))))))
+ ("rust-locale-config" ,rust-locale-config-0.2))))))
(define-public rust-gettext-sys-0.19
(package
@@ -10090,14 +10076,7 @@ retrieving random data from system source.")
(build-system cargo-build-system)
(arguments
`(#:cargo-inputs
- (("rust-cc" ,rust-cc-1))
- #:phases
- (modify-phases %standard-phases
- (add-after 'configure 'use-system-gettext
- (lambda* (#:key inputs #:allow-other-keys)
- (let ((gettext (assoc-ref inputs "gettext")))
- (setenv "GETTEXT_SYSTEM" gettext)
- #t))))))
+ (("rust-cc" ,rust-cc-1))))
(inputs
`(("gettext" ,gettext-minimal)))
(home-page "https://github.com/Koka/gettext-rs")
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")))