summary refs log tree commit diff
path: root/gnu/system/keyboard.scm
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2020-04-05 23:37:33 +0200
committerLudovic Courtès <ludo@gnu.org>2020-04-06 00:14:13 +0200
commit2729cb406d9f3e9eb22cc660f887138134edb3a8 (patch)
treedacd0b6cd5cb8c4d0eaaa34300fb5a696b8ddf7f /gnu/system/keyboard.scm
parentf4783d77ed8a24633611693b091102b226004971 (diff)
downloadguix-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/system/keyboard.scm')
-rw-r--r--gnu/system/keyboard.scm7
1 files changed, 5 insertions, 2 deletions
diff --git a/gnu/system/keyboard.scm b/gnu/system/keyboard.scm
index cd3ab37b27..5bd13a44be 100644
--- a/gnu/system/keyboard.scm
+++ b/gnu/system/keyboard.scm
@@ -1,5 +1,5 @@
 ;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2019 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2019, 2020 Ludovic Courtès <ludo@gnu.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -94,5 +94,8 @@ Layout information is taken from the XKEYBOARD-CONFIG package."
                    #$(keyboard-layout-name layout))))))
 
   (computed-file (string-append "console-keymap."
-                                (keyboard-layout-name layout))
+                                (string-map (match-lambda
+                                              (#\, #\-)
+                                              (chr chr))
+                                            (keyboard-layout-name layout)))
                  build))