HCoop
/
jackhill
/
guix
/
guix.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
gnu: Add go-github-com-blanu-dust.
[jackhill/guix/guix.git]
/
gnu
/
installer.scm
diff --git
a/gnu/installer.scm
b/gnu/installer.scm
index
c582a46
..
d2be4b3
100644
(file)
--- a/
gnu/installer.scm
+++ b/
gnu/installer.scm
@@
-187,7
+187,7
@@
selected keymap."
(lambda (models layouts)
((installer-keymap-page current-installer)
layouts '#$context)))))
(lambda (models layouts)
((installer-keymap-page current-installer)
layouts '#$context)))))
- (
#$apply-keymap result
)
+ (
and result (#$apply-keymap result)
)
result)))
(define (installer-steps)
result)))
(define (installer-steps)
@@
-266,6
+266,13
@@
selected keymap."
(compute (lambda _
((installer-network-page current-installer)))))
(compute (lambda _
((installer-network-page current-installer)))))
+ ;; Ask whether to enable substitute server discovery.
+ (installer-step
+ (id 'substitutes)
+ (description (G_ "Substitute server discovery"))
+ (compute (lambda _
+ ((installer-substitutes-page current-installer)))))
+
;; Prompt for users (name, group and home directory).
(installer-step
(id 'user)
;; Prompt for users (name, group and home directory).
(installer-step
(id 'user)
@@
-308,7
+315,8
@@
selected keymap."
;; translated.
#~(begin
(bindtextdomain "guix" (string-append #$guix "/share/locale"))
;; 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.
(define set-installer-path
;; Add the specified binary to PATH for later use by the installer.