* intltool: deleted redundant copy (it's already in the Gnome Nix

  expressions).
* Fixed xkbcomp: it no longer found the keyboard definitions since it
  disregards the -R option passed by the X server (it chdirs to the -R
  path, but "." has been removed from the xkbcomp search path in
  xkbcomp 1.0.5).  Build it with /etc/X11/xkb as its default
  location.  This is less pure but it does allow for updating
  xkeyboard-config in a running server.
* xkeyboard-config: updated to 1.4.

svn path=/nixpkgs/branches/stdenv-updates/; revision=13018

2 files changed, 5 insertions, 2 deletions

diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index 8fc7110fccd6..39505619738d 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -1934,7 +1934,7 @@ rec {
       url = mirror://xorg/X11R7.4/src/everything/xkbcomp-1.0.5.tar.bz2;
       sha256 = "1h809xl9kpx0r9ynvjfk7wy6rx8pgl1i14qh29r150wf73h06i10";
     };
-    buildInputs = [pkgconfig libX11 libxkbfile ];
+    buildInputs = [pkgconfig libX11 libxkbfile ]; NIX_CFLAGS_COMPILE = "-DDFLT_XKB_CONFIG_ROOT=\"/etc/X11/xkb\""; 
   }) // {inherit libX11 libxkbfile ;};
     
   xkbevd = (stdenv.mkDerivation {
diff --git a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
index 445f9909a865..b2e3fa78ff6a 100755
--- a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
+++ b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
@@ -62,6 +62,9 @@ $extraAttrs{"xf86inputevdev"} = "
 $extraAttrs{"libXpm"} = "
     patchPhase = \"sed -i '/USE_GETTEXT_TRUE/d' sxpm/Makefile.in cxpm/Makefile.in\";";
 
+$extraAttrs{"xkbcomp"} = " NIX_CFLAGS_COMPILE = \"-DDFLT_XKB_CONFIG_ROOT=\\\"/etc/X11/xkb\\\"\"; ";
+
+
 my $downloadCache = "./download-cache";
 $ENV{'NIX_DOWNLOAD_CACHE'} = $downloadCache;
 mkdir $downloadCache, 0755;
@@ -202,7 +205,7 @@ while (<>) {
 
 print "\nWRITE OUT\n";
 
-open OUT, ">default2.nix";
+open OUT, ">default.nix";
 
 print OUT "";
 print OUT <<EOF;