diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2019-04-17 15:13:31 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2019-04-17 15:13:31 +0200 |
| commit | 818595a974a3fc9caa7edd8a4f19d5485c91caba (patch) | |
| tree | 6577a9e7259a03242f311dadef4781b54e7888b1 /gnu/installer | |
| parent | feaa83a377966b6cec982f0bbaba1ea15c28d52e (diff) | |
| download | guix-818595a974a3fc9caa7edd8a4f19d5485c91caba.tar.gz | |
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.
Diffstat (limited to 'gnu/installer')
| -rw-r--r-- | gnu/installer/keymap.scm | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/gnu/installer/keymap.scm b/gnu/installer/keymap.scm index d66b376d9c..df9fc5e441 100644 --- a/gnu/installer/keymap.scm +++ b/gnu/installer/keymap.scm @@ -36,6 +36,7 @@ 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 @@ 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 @@ Configuration Database, describing possible XKB configurations." (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 @@ Configuration Database, describing possible XKB configurations." . ,rest-layout)) (x11-keymap-layout (name name) + (synopsis (car + (assoc-ref rest-layout 'shortDescription))) (description (car (assoc-ref rest-layout 'description))) (variants '()))])) |