ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2025-01-23 19:19:20 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

self: Bundle 'glibc-utf8-locales'.

Browse source 
This minimizes the risk of locale-related warnings, at least for those
who use one of the bundled UTF-8 locales.

* guix/self.scm (guix-command)[glibc-utf8-locales]: New variable.
In program body, set GUIX_LOCPATH.
This commit is contained in:
Ludovic Courtès 2019-02-14 17:41:42 +01:00
parent 8a973abc6f
commit ba48895899
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5
1 changed files with 14 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
guix/self.scm
View file

@ -390,6 +390,10 @@ (define* (guix-command modules
guile (guile-version (effective-version))) guile (guile-version (effective-version)))
"Return the 'guix' command such that it adds MODULES and DEPENDENCIES in its "Return the 'guix' command such that it adds MODULES and DEPENDENCIES in its
load path." load path."
(define glibc-utf8-locales
(module-ref (resolve-interface '(gnu packages base))
'glibc-utf8-locales))
(define module-directory (define module-directory
;; To minimize the number of 'stat' calls needed to locate a module, ;; To minimize the number of 'stat' calls needed to locate a module,
;; create the union of all the module directories. ;; create the union of all the module directories.
@ -410,6 +414,16 @@ (define module-directory
"/site-ccache") "/site-ccache")
%load-compiled-path)) %load-compiled-path))
;; To maximize the chances that locales are set up right
;; out-of-the-box, bundle "common" UTF-8 locales.
(let ((locpath (getenv "GUIX_LOCPATH")))
(setenv "GUIX_LOCPATH"
(string-append (if locpath
(string-append locpath ":")
"")
#$(file-append glibc-utf8-locales
"/lib/locale"))))
(let ((guix-main (module-ref (resolve-interface '(guix ui)) (let ((guix-main (module-ref (resolve-interface '(guix ui))
'guix-main))) 'guix-main)))
#$(if source #$(if source