From 70bb83b7b29ba9d5eb151aa2748717f182a25534 Mon Sep 17 00:00:00 2001
From: Ludovic Courtès <ludo@gnu.org>
Date: Mon, 25 Mar 2019 00:20:42 +0100
Subject: 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(-)

(limited to 'gnu')

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)
-- 
cgit 1.4.1