JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

nixos/xserver: fix evaluation of xkbDir

Browse Source 
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
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
nixos/modules/services/x11/xserver.nix
View File

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