alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

* Make sure that the X server can write the compiled xkb keymap. This

Browse source 
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
This commit is contained in:
Eelco Dolstra 2009-09-09 22:16:09 +00:00
parent cb3722a72a
commit 9d15693163
1 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
pkgs/servers/x11/xorg/overrides.nix
View file

@ -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
'';
};
}