From 9d156931631d1de6581793ce9b0ec30833597df3 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 9 Sep 2009 22:16:09 +0000
Subject: [PATCH] * Make sure that the X server can write the compiled xkb
 keymap.  This   requires $out/share/X11/xkb/compiled to be writable, so
 symlink it   to /var/tmp.  Using --with-xkb-output doesn't work in a chroot
 build   because `make install' tries to write a README.compiled file to  
 /var/tmp, which doesn't exist in the chroot.

svn path=/nixpkgs/trunk/; revision=17000
---
 pkgs/servers/x11/xorg/overrides.nix | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix
index a7d58f3d766..7b668414764 100644
--- a/pkgs/servers/x11/xorg/overrides.nix
+++ b/pkgs/servers/x11/xorg/overrides.nix
@@ -69,12 +69,11 @@
     patches = [./xorgserver-dri-path.patch ./xorgserver-xkbcomp-path.patch];
     buildInputs = attrs.buildInputs ++ [args.zlib xorg.xf86bigfontproto];
     propagatedBuildInputs = [xorg.libpciaccess];
-    /*
-    configureFlags = "--with-xkb-output=/var/tmp";
-    postPatch = ''
-      sed -i -e 's@ -w @ -I${args.xkeyboard_config}/etc/X11/xkb -w @' xkb/ddxLoad.c
-    '';
-    */
+    postInstall =
+      ''
+        rm -rf $out/share/X11/xkb/compiled
+        ln -s /var/tmp $out/share/X11/xkb/compiled
+      '';
   };
   
 }