me
/
guix
Archived
1
0
Fork 0
Code

installer: Parse the 'shortDescription' field from xkeyboard-config. 

* gnu/installer/keymap.scm (<x11-keymap-layout>)[synopsis]: New field.
(xkb-rules->models+layouts): Fill out the 'synopsis' field.
master
Ludovic Courtès 2019-04-17 15:13:31 +02:00
parent feaa83a377
commit 818595a974
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gnu/installer/keymap.scm
View File

@ -36,6 +36,7 @@
make-x11-keymap-layout make-x11-keymap-layout
x11-keymap-layout? x11-keymap-layout?
x11-keymap-layout-name x11-keymap-layout-name
x11-keymap-layout-synopsis
x11-keymap-layout-description x11-keymap-layout-description
x11-keymap-layout-variants x11-keymap-layout-variants
@ -60,7 +61,8 @@
x11-keymap-layout make-x11-keymap-layout x11-keymap-layout make-x11-keymap-layout
x11-keymap-layout? x11-keymap-layout?
(name x11-keymap-layout-name) ;string (name x11-keymap-layout-name) ;string
(description x11-keymap-layout-description) ;string (synopsis x11-keymap-layout-synopsis) ;string (e.g., "en")
(description x11-keymap-layout-description) ;string (a whole phrase)
(variants x11-keymap-layout-variants)) ;list of <x11-keymap-variant> (variants x11-keymap-layout-variants)) ;list of <x11-keymap-variant>
(define-record-type* <x11-keymap-variant> (define-record-type* <x11-keymap-variant>
@ -117,6 +119,8 @@ Configuration Database, describing possible XKB configurations."
(variantList ,[variant -> v] ...)) (variantList ,[variant -> v] ...))
(x11-keymap-layout (x11-keymap-layout
(name name) (name name)
(synopsis (car
(assoc-ref rest-layout 'shortDescription)))
(description (car (description (car
(assoc-ref rest-layout 'description))) (assoc-ref rest-layout 'description)))
(variants (list v ...)))] (variants (list v ...)))]
@ -126,6 +130,8 @@ Configuration Database, describing possible XKB configurations."
. ,rest-layout)) . ,rest-layout))
(x11-keymap-layout (x11-keymap-layout
(name name) (name name)
(synopsis (car
(assoc-ref rest-layout 'shortDescription)))
(description (car (description (car
(assoc-ref rest-layout 'description))) (assoc-ref rest-layout 'description)))
(variants '()))])) (variants '()))]))