mirror of
https://git.in.rschanz.org/ryan77627/guix.git
synced 2024-12-24 21:38:07 -05:00
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.
This commit is contained in:
parent
feaa83a377
commit
818595a974
1 changed files with 7 additions and 1 deletions
|
@ -36,6 +36,7 @@ (define-module (gnu installer keymap)
|
|||
make-x11-keymap-layout
|
||||
x11-keymap-layout?
|
||||
x11-keymap-layout-name
|
||||
x11-keymap-layout-synopsis
|
||||
x11-keymap-layout-description
|
||||
x11-keymap-layout-variants
|
||||
|
||||
|
@ -60,7 +61,8 @@ (define-record-type* <x11-keymap-layout>
|
|||
x11-keymap-layout make-x11-keymap-layout
|
||||
x11-keymap-layout?
|
||||
(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>
|
||||
|
||||
(define-record-type* <x11-keymap-variant>
|
||||
|
@ -117,6 +119,8 @@ (define (layout l)
|
|||
(variantList ,[variant -> v] ...))
|
||||
(x11-keymap-layout
|
||||
(name name)
|
||||
(synopsis (car
|
||||
(assoc-ref rest-layout 'shortDescription)))
|
||||
(description (car
|
||||
(assoc-ref rest-layout 'description)))
|
||||
(variants (list v ...)))]
|
||||
|
@ -126,6 +130,8 @@ (define (layout l)
|
|||
. ,rest-layout))
|
||||
(x11-keymap-layout
|
||||
(name name)
|
||||
(synopsis (car
|
||||
(assoc-ref rest-layout 'shortDescription)))
|
||||
(description (car
|
||||
(assoc-ref rest-layout 'description)))
|
||||
(variants '()))]))
|
||||
|
|
Loading…
Reference in a new issue