summary refs log tree commit diff
path: root/pkgs/servers/x11
diff options
context:
space:
mode:
authorDaniel Șerbănescu <daniel@serbanescu.dk>2019-08-18 15:03:38 +0200
committerrnhmjoj <rnhmjoj@inventati.org>2019-09-08 15:16:16 +0200
commite2fca8b1db9b861c7d877aac2631f734030b1f61 (patch)
tree5033aeed3def009d38872d237ccb731b8da5b9cb /pkgs/servers/x11
parent7468809e72366376db73b821c8f4439738a04c37 (diff)
downloadnixpkgs-e2fca8b1db9b861c7d877aac2631f734030b1f61.tar
nixpkgs-e2fca8b1db9b861c7d877aac2631f734030b1f61.tar.gz
nixpkgs-e2fca8b1db9b861c7d877aac2631f734030b1f61.tar.bz2
nixpkgs-e2fca8b1db9b861c7d877aac2631f734030b1f61.tar.lz
nixpkgs-e2fca8b1db9b861c7d877aac2631f734030b1f61.tar.xz
nixpkgs-e2fca8b1db9b861c7d877aac2631f734030b1f61.tar.zst
nixpkgs-e2fca8b1db9b861c7d877aac2631f734030b1f61.zip
nixos/xserver: refactor/fix xml tags for keyboard layout overrides
With the current XML tags there is an issue when building with a custom keyboard.
The description of the new keyboard layout will be missing in the built file: xkeyboard-config-2.27/share/X11/xkb/rules/evdev.lst
Diffstat (limited to 'pkgs/servers/x11')
-rw-r--r--pkgs/servers/x11/xorg/overrides.nix6
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix
index b581b7e8a4c..7e081b664b3 100644
--- a/pkgs/servers/x11/xorg/overrides.nix
+++ b/pkgs/servers/x11/xorg/overrides.nix
@@ -468,7 +468,7 @@ self: super:
         <model>
           <configItem>
             <name>${name}</name>
-            <_description>${layout.description}</_description>
+            <description>${layout.description}</description>
             <vendor>${layout.description}</vendor>
           </configItem>
         </model>
@@ -484,8 +484,8 @@ self: super:
         <layout>
           <configItem>
             <name>${name}</name>
-            <_shortDescription>${name}</_shortDescription>
-            <_description>${layout.description}</_description>
+            <shortDescription>${name}</shortDescription>
+            <description>${layout.description}</description>
             <languageList>
               ${concatMapStrings (lang: "<iso639Id>${lang}</iso639Id>\n") layout.languages}
             </languageList>