[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
14/68: installer: Fix locale installation.
From: |
guix-commits |
Subject: |
14/68: installer: Fix locale installation. |
Date: |
Thu, 17 Jan 2019 08:05:10 -0500 (EST) |
civodul pushed a commit to branch master
in repository guix.
commit 6b48825e4ba6435c2e3bbc85857ade16552be9c3
Author: Mathieu Othacehe <address@hidden>
Date: Sat Nov 24 14:06:40 2018 +0900
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.
---
gnu/installer.scm | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
diff --git a/gnu/installer.scm b/gnu/installer.scm
index 9e773ee..b3eb2a6 100644
--- a/gnu/installer.scm
+++ b/gnu/installer.scm
@@ -261,9 +261,6 @@ selected keymap."
(guix build utils)
(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
;; (guix i18n) module.
#$init-gettext
@@ -295,4 +292,11 @@ selected keymap."
(primitive-exit 1))))
((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)))))
- 11/68: gnu: installer: Launch the installer as kmscon login-program., (continued)
- 11/68: gnu: installer: Launch the installer as kmscon login-program., guix-commits, 2019/01/17
- 13/68: installer: Move everything to the build side., guix-commits, 2019/01/17
- 15/68: tests: Rename %test-encrypted-os to %test-encrypted-root-os., guix-commits, 2019/01/17
- 17/68: services: herd: Allow to pass arguments to start-service., guix-commits, 2019/01/17
- 19/68: gnu: Add guile-parted., guix-commits, 2019/01/17
- 16/68: build: syscalls: Add device-in-use?., guix-commits, 2019/01/17
- 18/68: gnu: guile-newt: Update to revision 4., guix-commits, 2019/01/17
- 62/68: installer: keymap: Put English layout and international variant ahead., guix-commits, 2019/01/17
- 12/68: installer: Rewrite welcome page., guix-commits, 2019/01/17
- 64/68: syscalls: 'device-in-use?' does not create a port., guix-commits, 2019/01/17
- 14/68: installer: Fix locale installation.,
guix-commits <=
- 68/68: installer: Fix manual partitioning., guix-commits, 2019/01/17
- 66/68: installer: Adjust messages on the final page., guix-commits, 2019/01/17
- 65/68: syscalls: 'device-in-use?' returns #f upon EINVAL., guix-commits, 2019/01/17
- 67/68: installer: "formating" → "formatting"., guix-commits, 2019/01/17
- 63/68: installer: partition: Add encryption password confirmation., guix-commits, 2019/01/17
- 03/68: services: kmscon: Remove virtual-terminal requirement., guix-commits, 2019/01/17
- 04/68: gnu: kmscon: Add runtime keymap update support., guix-commits, 2019/01/17
- 02/68: guile: newt: Update revision to 3., guix-commits, 2019/01/17
- 01/68: gnu: Add ghc-tldr., guix-commits, 2019/01/17
- 21/68: installer: Remove "selection" from all titles., guix-commits, 2019/01/17