summary refs log tree commit diff
path: root/nixos/modules/services/x11/xserver.nix
diff options
context:
space:
mode:
authorVladimír Čunát <vcunat@gmail.com>2015-12-26 09:06:28 +0100
committerVladimír Čunát <vcunat@gmail.com>2015-12-26 09:09:15 +0100
commit5a2f0541a1ff3756bae30b0115c1610222858a8f (patch)
treee9fa7e62a50444aa7ca65239e2279e51d1b55049 /nixos/modules/services/x11/xserver.nix
parent37d0947e0cea132b61932c78bddaeb24b5a91bff (diff)
downloadnixlib-5a2f0541a1ff3756bae30b0115c1610222858a8f.tar
nixlib-5a2f0541a1ff3756bae30b0115c1610222858a8f.tar.gz
nixlib-5a2f0541a1ff3756bae30b0115c1610222858a8f.tar.bz2
nixlib-5a2f0541a1ff3756bae30b0115c1610222858a8f.tar.lz
nixlib-5a2f0541a1ff3756bae30b0115c1610222858a8f.tar.xz
nixlib-5a2f0541a1ff3756bae30b0115c1610222858a8f.tar.zst
nixlib-5a2f0541a1ff3756bae30b0115c1610222858a8f.zip
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).
Diffstat (limited to 'nixos/modules/services/x11/xserver.nix')
-rw-r--r--nixos/modules/services/x11/xserver.nix7
1 files changed, 4 insertions, 3 deletions
diff --git a/nixos/modules/services/x11/xserver.nix b/nixos/modules/services/x11/xserver.nix
index 2bcaf2cf2a37..768fa50313a9 100644
--- a/nixos/modules/services/x11/xserver.nix
+++ b/nixos/modules/services/x11/xserver.nix
@@ -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"