[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
13/67: installer: Fix locale installation.
From: |
guix-commits |
Subject: |
13/67: installer: Fix locale installation. |
Date: |
Wed, 16 Jan 2019 19:00:37 -0500 (EST) |
civodul pushed a commit to branch wip-newt-installer
in repository guix.
commit c5abfb12a532e9cdadada6bda9dd42814c9d500d
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)))))
- 30/67: installer: Add user module., (continued)
- 30/67: installer: Add user module., guix-commits, 2019/01/16
- 50/67: installer: partition: Fix typo., guix-commits, 2019/01/16
- 49/67: installer: partition: Fix swaping and use syscalls., guix-commits, 2019/01/16
- 53/67: file-systems: Add read-luks-partition-uuid., guix-commits, 2019/01/16
- 46/67: installer: Display an eventual backtrace in a page., guix-commits, 2019/01/16
- 22/67: installer: Add configuration formatter., guix-commits, 2019/01/16
- 57/67: installer: parted: Do not call BLKRRPART on loop devices., guix-commits, 2019/01/16
- 08/67: doc: Document the graphical installer., guix-commits, 2019/01/16
- 03/67: gnu: kmscon: Add runtime keymap update support., guix-commits, 2019/01/16
- 27/67: installer: Redirect to TTY3 root shell for unguided install., guix-commits, 2019/01/16
- 13/67: installer: Fix locale installation.,
guix-commits <=
- 29/67: installer: Fix comments., guix-commits, 2019/01/16
- 25/67: installer: Add hostname., guix-commits, 2019/01/16
- 32/67: installer: Reorder POTFILES.in, guix-commits, 2019/01/16
- 38/67: installer: locale: Set English as the default language., guix-commits, 2019/01/16
- 34/67: installer: Remove group selection in user page., guix-commits, 2019/01/16
- 40/67: installer: keymap: Do not fail on non-kmscon terminals., guix-commits, 2019/01/16
- 45/67: installer: Make exit button optional for run-file-textbox-page., guix-commits, 2019/01/16
- 43/67: installer: partition: Differenciate Back button from Exit button., guix-commits, 2019/01/16
- 48/67: installer: menu: Fix typo., guix-commits, 2019/01/16
- 52/67: installer: Clear screen upon exit., guix-commits, 2019/01/16