diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2020-04-05 23:37:33 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2020-04-06 00:14:13 +0200 |
| commit | 2729cb406d9f3e9eb22cc660f887138134edb3a8 (patch) | |
| tree | dacd0b6cd5cb8c4d0eaaa34300fb5a696b8ddf7f /gnu/bootloader | |
| parent | f4783d77ed8a24633611693b091102b226004971 (diff) | |
| download | patches-2729cb406d9f3e9eb22cc660f887138134edb3a8.tar patches-2729cb406d9f3e9eb22cc660f887138134edb3a8.tar.gz | |
system: Allow for comma-separated keyboard layouts.
Reported by Florian Pelz <pelzflorian@pelzflorian.de>.
* gnu/bootloader/grub.scm (keyboard-layout-file): Replace commas with
hyphens in the first argument to 'computed-file'.
* gnu/system/keyboard.scm (keyboard-layout->console-keymap): Likewise.
* doc/guix.texi (Keyboard Layout): Add example.
Diffstat (limited to 'gnu/bootloader')
| -rw-r--r-- | gnu/bootloader/grub.scm | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/gnu/bootloader/grub.scm b/gnu/bootloader/grub.scm index 28e6cb1f5f..190b717163 100644 --- a/gnu/bootloader/grub.scm +++ b/gnu/bootloader/grub.scm @@ -240,7 +240,11 @@ the 'share/X11/xkb/symbols/' directory of 'xkeyboard-config'." "-i" #+(keyboard-layout->console-keymap layout) "-o" #$output)))) - (computed-file (string-append "grub-keymap." (keyboard-layout-name layout)) + (computed-file (string-append "grub-keymap." + (string-map (match-lambda + (#\, #\-) + (chr chr)) + (keyboard-layout-name layout))) builder)) (define (grub-setup-io config) |