Merge pull request #19196 from groxxda/xkbbindir

xserver: replace XKB_BINDIR with compile time option
2016-10-03 17:12:59 +02:00
parent a9cd913b73 e7ded267bd
commit 69bb34673e
10 changed files with 3 additions and 30 deletions
@@ -20,7 +20,6 @@ stdenv.mkDerivation rec {

  patchPhase = ''
    sed -i -e 's,$(includedir)/pixman-1,${if stdenv ? cross then pixman.crossDrv else pixman}/include/pixman-1,' unix/xserver/hw/vnc/Makefile.am
-    sed -i -e '/^$pidFile/a$ENV{XKB_BINDIR}="${if stdenv ? cross then xorg.xkbcomp.crossDrv else xorg.xkbcomp}/bin";' unix/vncserver
    sed -i -e '/^\$cmd \.= " -pn";/a$cmd .= " -xkbdir ${if stdenv ? cross then xkeyboard_config.crossDrv else xkeyboard_config}/etc/X11/xkb";' unix/vncserver
    fontPath=
    for i in $fontDirectories; do