diff options
author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2009-09-09 22:16:09 +0000 |
---|---|---|
committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2009-09-09 22:16:09 +0000 |
commit | 9d156931631d1de6581793ce9b0ec30833597df3 (patch) | |
tree | b653a9635ebd97d36624b726f0781def97b90295 /pkgs/servers | |
parent | cb3722a72ac17fd74797a6475218f546daac9609 (diff) | |
download | nixlib-9d156931631d1de6581793ce9b0ec30833597df3.tar nixlib-9d156931631d1de6581793ce9b0ec30833597df3.tar.gz nixlib-9d156931631d1de6581793ce9b0ec30833597df3.tar.bz2 nixlib-9d156931631d1de6581793ce9b0ec30833597df3.tar.lz nixlib-9d156931631d1de6581793ce9b0ec30833597df3.tar.xz nixlib-9d156931631d1de6581793ce9b0ec30833597df3.tar.zst nixlib-9d156931631d1de6581793ce9b0ec30833597df3.zip |
* 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
Diffstat (limited to 'pkgs/servers')
-rw-r--r-- | pkgs/servers/x11/xorg/overrides.nix | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index a7d58f3d7666..7b668414764f 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 + ''; }; } |