[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
02/10: gnu: guix: Embed 'glibc-utf8-locales'.
From: |
guix-commits |
Subject: |
02/10: gnu: guix: Embed 'glibc-utf8-locales'. |
Date: |
Fri, 15 Feb 2019 19:01:51 -0500 (EST) |
civodul pushed a commit to branch master
in repository guix.
commit 8a973abc6f7eebfcd8a904bfbb99cb9f86f66ef0
Author: Ludovic Courtès <address@hidden>
Date: Thu Feb 14 23:07:42 2019 +0100
gnu: guix: Embed 'glibc-utf8-locales'.
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 eff8d5c..44c6c1c 100644
--- a/gnu/packages/package-management.scm
+++ b/gnu/packages/package-management.scm
@@ -34,6 +34,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'
@@ -228,6 +229,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
@@ -246,11 +248,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)
@@ -283,7 +287,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)
- branch master updated (3a34c9e -> aa71b69), guix-commits, 2019/02/15
- 04/10: packages: Remove duplicates from package cache., guix-commits, 2019/02/15
- 03/10: self: Bundle 'glibc-utf8-locales'., guix-commits, 2019/02/15
- 02/10: gnu: guix: Embed 'glibc-utf8-locales'.,
guix-commits <=
- 01/10: environment: Add '--inherit'., guix-commits, 2019/02/15
- 05/10: gnu: librime: Update to 1.4.0., guix-commits, 2019/02/15
- 08/10: gnu: luakit: Update to 2.1., guix-commits, 2019/02/15
- 06/10: gnu: rime-data: Update to 0.38.20190131., guix-commits, 2019/02/15
- 10/10: gnu: pelican: Update to 4.0.1, guix-commits, 2019/02/15
- 07/10: gnu: ibus-rime: Update to 1.4.0., guix-commits, 2019/02/15
- 09/10: gnu: emacs-cider: Update to 0.20.0, guix-commits, 2019/02/15