mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-01 23:22:37 +00:00
* 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
This commit is contained in:
parent
cb3722a72a
commit
9d15693163
@ -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
|
||||
'';
|
||||
};
|
||||
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user