installer: Call setlocale after init gettext.

[jackhill/guix/guix.git] / gnu / installer.scm

diff --git a/gnu/installer.scm b/gnu/installer.scm
index 79113cb..f401b24 100644 (file)
--- a/gnu/installer.scm
+++ b/gnu/installer.scm
@@ -71,7 +71,7 @@
     (_ #f)))
 
 (define* (build-compiled-file name locale-builder)
-  "Return a file-like object that evalutes the gexp LOCALE-BUILDER and store
+  "Return a file-like object that evaluates the gexp LOCALE-BUILDER and store
 its result in the scheme file NAME. The derivation will also build a compiled
 version of this file."
   (define set-utf8-locale
@@ -308,7 +308,8 @@ selected keymap."
     ;; translated.
     #~(begin
         (bindtextdomain "guix" (string-append #$guix "/share/locale"))
-        (textdomain "guix")))
+        (textdomain "guix")
+        (setlocale LC_ALL "")))
 
   (define set-installer-path
     ;; Add the specified binary to PATH for later use by the installer.
@@ -318,8 +319,10 @@ selected keymap."
                        cryptsetup
                        dosfstools ;mkfs.fat
                        e2fsprogs ;mkfs.ext4
+                       lvm2-static ;dmsetup
                        btrfs-progs
                        jfsutils ;jfs_mkfs
+                       ntfs-3g ;mkfs.ntfs
                        kbd ;chvt
                        guix ;guix system init call
                        util-linux ;mkwap
@@ -440,5 +443,6 @@ selected keymap."
        ;; some reason, unicode support is not correctly installed
        ;; when calling this in 'installer-builder'.
        (setenv "LANG" "en_US.UTF-8")
-       (execl #$(program-file "installer-real" installer-builder)
+       (execl #$(program-file "installer-real" installer-builder
+                              #:guile guile-3.0-latest)
               "installer-real"))))