aboutsummaryrefslogtreecommitdiff
path: root/pkgs/servers
diff options
context:
space:
mode:
authorJan Tojnar <jtojnar@gmail.com>2019-09-10 07:06:45 +0200
committerJan Tojnar <jtojnar@gmail.com>2019-09-10 07:06:45 +0200
commit1716d62f633cd091fce0d61517bb79504c300d36 (patch)
tree5abe8333c83e247f364cf835efc7fc669d36c311 /pkgs/servers
parentdc051dfdef1ec4c9bdd90b228764b6c24372597e (diff)
parent8752ff225446422b902d9f88d6f75f9928d4eb34 (diff)
Merge branch 'staging-next' into staging
Diffstat (limited to 'pkgs/servers')
-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>