ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-12-28 07:12:30 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

build-system/cargo: Set gettext environment variable when available.

Browse source 
* 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.
This commit is contained in:
Efraim Flashner 2020-11-22 19:29:32 +02:00
parent 8aae54f46b
commit 1ca0c34867
No known key found for this signature in database
GPG key ID: 41AAE7DCCA3D8351
2 changed files with 5 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
gnu/packages/crates-io.scm
View file

@ -10030,14 +10030,7 @@ (define-public rust-gettext-rs-0.5
(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 @@ (define-public rust-gettext-rs-0.4
(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 @@ (define-public rust-gettext-sys-0.19
(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")

2
guix/build/cargo-build-system.scm
View file

@ -124,6 +124,8 @@ (define* (configure #:key inputs
(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")))