diff options
| author | Jörg Thalheim <joerg@higgsboson.tk> | 2016-12-13 17:27:23 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-12-13 17:27:23 +0100 |
| commit | 8aecafcf5e53c1511a567b4d6e3a11b573d6b9aa (patch) | |
| tree | b29398b261c55a95359c4541b2e70ee063b3ac99 /pkgs/tools/admin/tigervnc | |
| parent | 62934023c3ece9c6339816dd0d8e7cfe0995e0a9 (diff) | |
| download | nixpkgs-8aecafcf5e53c1511a567b4d6e3a11b573d6b9aa.tar nixpkgs-8aecafcf5e53c1511a567b4d6e3a11b573d6b9aa.tar.gz nixpkgs-8aecafcf5e53c1511a567b4d6e3a11b573d6b9aa.tar.bz2 nixpkgs-8aecafcf5e53c1511a567b4d6e3a11b573d6b9aa.tar.lz nixpkgs-8aecafcf5e53c1511a567b4d6e3a11b573d6b9aa.tar.xz nixpkgs-8aecafcf5e53c1511a567b4d6e3a11b573d6b9aa.tar.zst nixpkgs-8aecafcf5e53c1511a567b4d6e3a11b573d6b9aa.zip | |
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.
Diffstat (limited to 'pkgs/tools/admin/tigervnc')
| -rw-r--r-- | pkgs/tools/admin/tigervnc/default.nix | 19 |
1 files changed, 15 insertions, 4 deletions
diff --git a/pkgs/tools/admin/tigervnc/default.nix b/pkgs/tools/admin/tigervnc/default.nix index d0eb9e8fb15..901ec06ea65 100644 --- a/pkgs/tools/admin/tigervnc/default.nix +++ b/pkgs/tools/admin/tigervnc/default.nix @@ -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 |