[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[bug#34480] [PATCH 2/2] gnu: guix: Embed 'glibc-utf8-locales'.
From: |
Ludovic Courtès |
Subject: |
[bug#34480] [PATCH 2/2] gnu: guix: Embed 'glibc-utf8-locales'. |
Date: |
Thu, 14 Feb 2019 23:21:20 +0100 |
This will ensure people who download the binary installation tarball
do not get locale-related warnings, provided they use one of the
selected UTF-8 locales.
* gnu/packages/package-management.scm (guix)[arguments]: In
'wrap-program' phase, set GUIX_LOCPATH.
[inputs]: Add GLIBC-UTF8-LOCALES.
---
gnu/packages/package-management.scm | 12 +++++++++---
1 file changed, 9 insertions(+), 3 deletions(-)
diff --git a/gnu/packages/package-management.scm
b/gnu/packages/package-management.scm
index af9667cd91..e283df65f8 100644
--- a/gnu/packages/package-management.scm
+++ b/gnu/packages/package-management.scm
@@ -33,6 +33,7 @@
#:use-module (gnu packages avahi)
#:use-module (gnu packages autotools)
#:use-module (gnu packages backup)
+ #:use-module (gnu packages base)
#:use-module (gnu packages bdw-gc)
#:use-module (gnu packages bison)
#:use-module (gnu packages bootstrap) ;for 'bootstrap-guile-origin'
@@ -227,6 +228,7 @@
"guile-bytestructures"))
(ssh (assoc-ref inputs "guile-ssh"))
(gnutls (assoc-ref inputs "gnutls"))
+ (locales (assoc-ref inputs
"glibc-utf8-locales"))
(deps (list gcrypt json sqlite gnutls
git bs ssh))
(effective
@@ -245,11 +247,13 @@
"/lib/guile/" effective
"/site-ccache")
(delete #f deps))
- ":")))
+ ":"))
+ (locpath (string-append locales "/lib/locale")))
(wrap-program (string-append out "/bin/guix")
`("GUILE_LOAD_PATH" ":" prefix (,path))
- `("GUILE_LOAD_COMPILED_PATH" ":" prefix (,gopath)))
+ `("GUILE_LOAD_COMPILED_PATH" ":" prefix (,gopath))
+ `("GUIX_LOCPATH" ":" suffix (,locpath)))
#t))))))
(native-inputs `(("pkg-config" ,pkg-config)
@@ -282,7 +286,9 @@
,@(if (and (not (%current-target-system))
(string=? (%current-system) "x86_64-linux"))
`(("boot-guile/i686" ,(bootstrap-guile-origin "i686-linux")))
- '())))
+ '())
+
+ ("glibc-utf8-locales" ,glibc-utf8-locales)))
(propagated-inputs
`(("gnutls" ,gnutls)
("guile-gcrypt" ,guile-gcrypt)
--
2.20.1