From 5a2f0541a1ff3756bae30b0115c1610222858a8f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sat, 26 Dec 2015 09:06:28 +0100
Subject: [PATCH] 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).
---
 nixos/modules/services/x11/xserver.nix | 7 ++++---
 1 file 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"