me/guix
Archived
1
0
Fork 0
Code Activity

services: xorg: Fix cases where 'keyboard-layout' is #f.

Browse source 
This is a followup to 598757e038.

* gnu/services/xorg.scm (xorg-configuration->file): Check whether
'xorg-configuration-keyboard-layout' returns #f before calling
'keyboard-layout-options'.
This commit is contained in:
Ludovic Courtès 2019-03-25 00:20:42 +01:00
parent b9a57fd1b2
commit 70bb83b7b2
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
gnu/services/xorg.scm
View file

@ -274,8 +274,8 @@ EndSection\n" port)
keyboard-layout-variant)) keyboard-layout-variant))
(model #$(and=> (xorg-configuration-keyboard-layout config) (model #$(and=> (xorg-configuration-keyboard-layout config)
keyboard-layout-model)) keyboard-layout-model))
(options '#$(keyboard-layout-options (options '#$(and=> (xorg-configuration-keyboard-layout config)
(xorg-configuration-keyboard-layout config)))) keyboard-layout-options)))
(when layout (when layout
(display (input-class-section layout variant model options) (display (input-class-section layout variant model options)
port) port)