nixos/xserver: fix evaluation of xkbDir

I solved it this way because it seems the current state-of-the-art 89e983786
The problem was introduced in #11930. Close #11951 (a different solution).
This commit is contained in:
Vladimír Čunát 2015-12-26 09:06:28 +01:00
parent 37d0947e0c
commit 5a2f0541a1

View file

@ -281,10 +281,9 @@ in
};
xkbDir = mkOption {
type = types.str;
default = "${pkgs.xkeyboard_config}/etc/X11/xkb";
type = types.path;
description = ''
Path used for -xkbdir xserver parameter.
Path used for -xkbdir xserver parameter.
'';
};
@ -548,6 +547,8 @@ in
xorg.xf86inputevdev
];
services.xserver.xkbDir = mkDefault "${pkgs.xkeyboard_config}/etc/X11/xkb";
services.xserver.config =
''
Section "ServerFlags"