From 92e48a4383484f21d2979728a251b257ccc2db19 Mon Sep 17 00:00:00 2001
From: Reno Reckling <exi@wthack.de>
Date: Thu, 24 Dec 2015 13:30:42 +0100
Subject: [PATCH] xserver: make xkbdir configurable

---
 nixos/modules/services/x11/xserver.nix | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/services/x11/xserver.nix b/nixos/modules/services/x11/xserver.nix
index d637a753bb2..2bcaf2cf2a3 100644
--- a/nixos/modules/services/x11/xserver.nix
+++ b/nixos/modules/services/x11/xserver.nix
@@ -280,6 +280,14 @@ in
         '';
       };
 
+      xkbDir = mkOption {
+        type = types.str;
+        default = "${pkgs.xkeyboard_config}/etc/X11/xkb";
+        description = ''
+        Path used for -xkbdir xserver parameter.
+        '';
+      };
+
       config = mkOption {
         type = types.lines;
         description = ''
@@ -462,7 +470,7 @@ in
             target = "X11/xorg.conf";
           }
           # -xkbdir command line option does not seems to be passed to xkbcomp.
-          { source = "${pkgs.xkeyboard_config}/etc/X11/xkb";
+          { source = "${cfg.xkbDir}";
             target = "X11/xkb";
           }
         ]);
@@ -528,7 +536,7 @@ in
       [ "-ac"
         "-terminate"
         "-config ${configFile}"
-        "-xkbdir" "${pkgs.xkeyboard_config}/etc/X11/xkb"
+        "-xkbdir" "${cfg.xkbDir}"
       ] ++ optional (cfg.display != null) ":${toString cfg.display}"
         ++ optional (cfg.tty     != null) "vt${toString cfg.tty}"
         ++ optionals (cfg.display != null) [ "-logfile" "/var/log/X.${toString cfg.display}.log" ]