tigervnc: fix missing Xvnc (xauth) (#21110)
the xorg patch was not applied. Also a different root for `make install` is needed. In addition more unnessary option are disabled.
This commit is contained in:
parent
62934023c3
commit
8aecafcf5e
@ -39,9 +39,20 @@ stdenv.mkDerivation rec {
|
||||
tar xf ${xorg.xorgserver.src}
|
||||
cp -R xorg*/* unix/xserver
|
||||
pushd unix/xserver
|
||||
version=$(echo ${xorg.xorgserver.name} | sed 's/.*-\([0-9]\+\).\([0-9]\+\).*/\1\2/g')
|
||||
patch -p1 < ${src}/unix/xserver$version.patch
|
||||
autoreconf -vfi
|
||||
./configure $configureFlags --disable-devel-docs --disable-docs --disable-xinerama --disable-xvfb --disable-xnest \
|
||||
--disable-xorg --disable-dmx --disable-dri --disable-dri2 --disable-glx \
|
||||
./configure $configureFlags --disable-devel-docs --disable-docs \
|
||||
--disable-xorg --disable-xnest --disable-xvfb --disable-dmx \
|
||||
--disable-xwin --disable-xephyr --disable-kdrive --with-pic \
|
||||
--disable-xorgcfg --disable-xprint --disable-static \
|
||||
--disable-composite --disable-xtrap --enable-xcsecurity \
|
||||
--disable-{a,c,m}fb \
|
||||
--disable-xwayland \
|
||||
--disable-config-dbus --disable-config-udev --disable-config-hal \
|
||||
--disable-xevie \
|
||||
--disable-dri --disable-dri2 --disable-dri3 --enable-glx \
|
||||
--enable-install-libxf86config \
|
||||
--prefix="$out" --disable-unit-tests \
|
||||
--with-xkb-path=${xkeyboard_config}/share/X11/xkb \
|
||||
--with-xkb-bin-directory=${xorg.xkbcomp}/bin \
|
||||
@ -49,9 +60,9 @@ stdenv.mkDerivation rec {
|
||||
make TIGERVNC_SRCDIR=`pwd`/../..
|
||||
popd
|
||||
'';
|
||||
|
||||
|
||||
postInstall = ''
|
||||
pushd unix/xserver
|
||||
pushd unix/xserver/hw/vnc
|
||||
make TIGERVNC_SRCDIR=`pwd`/../.. install
|
||||
popd
|
||||
rm -f $out/lib/xorg/protocol.txt
|
||||
|
Loading…
Reference in New Issue
Block a user