diff options
author | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2010-07-12 22:15:50 +0000 |
---|---|---|
committer | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2010-07-12 22:15:50 +0000 |
commit | 6c0b62d1a5b3c6c718cfdec0e2c39439f299a2e4 (patch) | |
tree | e0e498ef27f496edca17f1f77351419549256676 /pkgs/tools/admin/tigervnc | |
parent | 196e8ad0f6e45e4300eab2877d57859e84370854 (diff) | |
download | nixlib-6c0b62d1a5b3c6c718cfdec0e2c39439f299a2e4.tar nixlib-6c0b62d1a5b3c6c718cfdec0e2c39439f299a2e4.tar.gz nixlib-6c0b62d1a5b3c6c718cfdec0e2c39439f299a2e4.tar.bz2 nixlib-6c0b62d1a5b3c6c718cfdec0e2c39439f299a2e4.tar.lz nixlib-6c0b62d1a5b3c6c718cfdec0e2c39439f299a2e4.tar.xz nixlib-6c0b62d1a5b3c6c718cfdec0e2c39439f299a2e4.tar.zst nixlib-6c0b62d1a5b3c6c718cfdec0e2c39439f299a2e4.zip |
Made the tightvnc build the Xvnc server - although I still did not manage to start it.
svn path=/nixpkgs/trunk/; revision=22569
Diffstat (limited to 'pkgs/tools/admin/tigervnc')
-rw-r--r-- | pkgs/tools/admin/tigervnc/default.nix | 65 |
1 files changed, 58 insertions, 7 deletions
diff --git a/pkgs/tools/admin/tigervnc/default.nix b/pkgs/tools/admin/tigervnc/default.nix index 8f14a9bd9cc2..40e7da709c72 100644 --- a/pkgs/tools/admin/tigervnc/default.nix +++ b/pkgs/tools/admin/tigervnc/default.nix @@ -1,17 +1,68 @@ -{stdenv, fetchurl, libX11, libXext, gettext, libICE, libXtst, libXi, libSM}: +{stdenv, fetchsvn, libX11, libXext, gettext, libICE, libXtst, libXi, libSM, xorgserver, +autoconf, automake, cvs, libtool, nasm, utilmacros, pixman }: + +with stdenv.lib; stdenv.mkDerivation { - name = "tigervnc-1.0.1"; - src = fetchurl { - url = mirror://sourceforge/tigervnc/tigervnc-1.0.1.tar.gz; - sha256 = "06qxavpq6d71ca224yxvr9h5ynydqhaz2nf06ajin5kjjdliphsr"; + name = "tigervnc-svn-4086"; + src = fetchsvn { + url = https://tigervnc.svn.sourceforge.net/svnroot/tigervnc/trunk; + rev = 4086; + sha256 = "0aqn9d5yz21k5l4mwh5f73il77w2rbvsrz91z3lz4bizivvkwszc"; }; preConfigure = '' - cd unix + autoreconf -vfi ''; configureFlags = "--enable-nls"; - buildInputs = [ libX11 libXext gettext libICE libXtst libXi libSM ]; + patchPhase = '' + sed -i -e 's,$(includedir)/pixman-1,${pixman}/include/pixman-1,' unix/xserver/hw/vnc/Makefile.am + ''; + + xorgPatches = xorgserver.patches; + + postBuild = '' + # Build Xvnc + tar xf ${xorgserver.src} + cp -R xorg*/* unix/xserver + pushd unix/xserver + # This below does not work and I don't know why: + #for a in ${concatStringsSep " " (map (f: "${f}") xorgserver.patches)} + for a in $xorgPatches + do + patch -p1 < $a + done + patch -p1 < ../xserver17.patch + autoreconf -vfi + ./configure --prefix=$out --disable-xinerama --disable-xvfb --disable-xnest --disable-xorg --disable-dmx + make TIGERVNC_SRCDIR=`pwd`/../.. + popd + ''; + + # I don't know why I need this; it may have to do with this problem: + # http://bugs.gentoo.org/show_bug.cgi?id=142852 + preInstall = '' + sed -i -e s,@MKINSTALLDIRS@,`pwd`/mkinstalldirs, po/Makefile + ''; + + postInstall = '' + pushd unix/xserver + make TIGERVNC_SRCDIR=`pwd`/../.. install + ''; + + buildInputs = [ libX11 libXext gettext libICE libXtst libXi libSM autoconf automake cvs + libtool nasm utilmacros ] ++ xorgserver.buildNativeInputs; + + propagatedBuildInputs = xorgserver.propagatedBuildNativeInputs; + + meta = { + homepage = http://www.tigervnc.org/; + license = "GPLv2+"; + description = "Fork of tightVNC, made in cooperation with VirtualGL"; + maintainers = with stdenv.lib.maintainers; [viric]; + platforms = with stdenv.lib.platforms; linux; + }; + } |