aboutsummaryrefslogtreecommitdiff
path: root/gnu/services/xorg.scm
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2019-03-25 00:20:42 +0100
committerLudovic Courtès <ludo@gnu.org>2019-03-25 00:21:48 +0100
commit70bb83b7b29ba9d5eb151aa2748717f182a25534 (patch)
tree44e59e4f926756efc09f90f7585c32b81ddc4436 /gnu/services/xorg.scm
parentb9a57fd1b297592f7382c76490b0293e7125f183 (diff)
downloadguix-70bb83b7b29ba9d5eb151aa2748717f182a25534.tar
guix-70bb83b7b29ba9d5eb151aa2748717f182a25534.tar.gz
services: xorg: Fix cases where 'keyboard-layout' is #f.
This is a followup to 598757e038ab5dea3b59c9c248a2ad860c41fe62. * gnu/services/xorg.scm (xorg-configuration->file): Check whether 'xorg-configuration-keyboard-layout' returns #f before calling 'keyboard-layout-options'.
Diffstat (limited to 'gnu/services/xorg.scm')
-rw-r--r--gnu/services/xorg.scm4
1 files changed, 2 insertions, 2 deletions
diff --git a/gnu/services/xorg.scm b/gnu/services/xorg.scm
index 05465f3bdf..f047b8a043 100644
--- a/gnu/services/xorg.scm
+++ b/gnu/services/xorg.scm
@@ -274,8 +274,8 @@ EndSection\n" port)
keyboard-layout-variant))
(model #$(and=> (xorg-configuration-keyboard-layout config)
keyboard-layout-model))
- (options '#$(keyboard-layout-options
- (xorg-configuration-keyboard-layout config))))
+ (options '#$(and=> (xorg-configuration-keyboard-layout config)
+ keyboard-layout-options)))
(when layout
(display (input-class-section layout variant model options)
port)