me
/
guix
Archived
1
0
Fork 0
Code

installer: Fix locale installation. 

For some mysterious reason, calling 'setlocale' as first instruction of
installer-builder does not install unicode support correctly. So set LANG env
variable and start the installer until this is understood.

* gnu/installer.scm (installer-program): Wrap installer-builder to have the
opportunity to set LANG environment variable before starting the installer.
master
Mathieu Othacehe 2018-11-24 14:06:40 +09:00 committed by Ludovic Courtès
parent a49d633c0c
commit 6b48825e4b
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
gnu/installer.scm
View File

@ -261,9 +261,6 @@ selected keymap."
(guix build utils) (guix build utils)
(ice-9 match)) (ice-9 match))
;; Set the default locale to install unicode support.
(setlocale LC_ALL "en_US.utf8")
;; Initialize gettext support so that installers can use ;; Initialize gettext support so that installers can use
;; (guix i18n) module. ;; (guix i18n) module.
#$init-gettext #$init-gettext
@ -295,4 +292,11 @@ selected keymap."
(primitive-exit 1)))) (primitive-exit 1))))
((installer-exit current-installer)))))) ((installer-exit current-installer))))))
(program-file "installer" installer-builder)) (program-file
"installer"
#~(begin
;; Set the default locale to install unicode support. For
;; some reason, unicode support is not correctly installed
;; when calling this in 'installer-builder'.
(setenv "LANG" "en_US.UTF-8")
(system #$(program-file "installer-real" installer-builder)))))