From e6ae383b9b6608e2af216d92972ca02434791a61 Mon Sep 17 00:00:00 2001 From: Nicolas Pierron Date: Wed, 27 May 2009 20:27:59 +0000 Subject: [PATCH] Add a temporary work-around to be able to use non-us keyboard layout. xkbcomp does not look inside the directory specified with the option -xkbdir. svn path=/nixos/branches/modular-nixos/; revision=15752 --- modules/services/x11/xserver/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/services/x11/xserver/default.nix b/modules/services/x11/xserver/default.nix index 3904566d2f3..954c267b83f 100644 --- a/modules/services/x11/xserver/default.nix +++ b/modules/services/x11/xserver/default.nix @@ -499,6 +499,10 @@ mkIf cfg.enable { { source = "${configFile}"; target = "X11/xorg.conf"; } + # -xkbdir command line option does not seems to be passed to xkbcomp. + { source = "${pkgs.xkeyboard_config}/etc/X11/xkb"; + target = "X11/xkb"; + } ]; extraPackages = [