[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/01: services: xorg: Fix cases where 'keyboard-layout' is #f.
From: |
guix-commits |
Subject: |
01/01: services: xorg: Fix cases where 'keyboard-layout' is #f. |
Date: |
Sun, 24 Mar 2019 19:27:24 -0400 (EDT) |
civodul pushed a commit to branch master
in repository guix.
commit 70bb83b7b29ba9d5eb151aa2748717f182a25534
Author: Ludovic Courtès <address@hidden>
Date: Mon Mar 25 00:20:42 2019 +0100
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'.
---
gnu/services/xorg.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/gnu/services/xorg.scm b/gnu/services/xorg.scm
index 05465f3..f047b8a 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)