public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update TigerVNC to SVN checkout that at least builds..

Browse Source
This commit is contained in:
Michael Raskin
2012-10-18 20:49:22 +04:00
parent 76c010b928
commit 0e930058ae
5 changed files with 60 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/tools/admin/tigervnc/default.nix
+24 -19
View File
@@ -3,21 +3,25 @@
, fontDirectories, fontutil, libgcrypt, gnutls, pam, flex, bison
, fixesproto, damageproto, xcmiscproto, bigreqsproto, randrproto, renderproto
, fontsproto, videoproto, compositeproto, scrnsaverproto, resourceproto
, libxkbfile, libXfont, libpciaccess
, libxkbfile, libXfont, libpciaccess, cmake, libjpeg_turbo, libXft, fltk, libXinerama
, xineramaproto, libXcursor, fetchsvn, libxcrypt
}:
with stdenv.lib;
stdenv.mkDerivation rec {
name = "tigervnc-1.1.0";
# Release version = "1.2.0";
revision = 5005;
version = "r${toString revision}";
name = "tigervnc-${version}";
src = fetchurl {
url = "mirror://sourceforge/tigervnc/${name}.tar.gz";
sha256 = "1x30s12fwv9rk0fnwwn631qq0d8rpjjx53bvzlx8c91cba170jsr";
src = fetchsvn {
# Release url = "mirror://sourceforge/tigervnc/${version}/${name}.tar.gz";
url = "https://tigervnc.svn.sourceforge.net/svnroot/tigervnc/trunk";
rev = revision;
sha256 = "2401e0ede9a2d50a37caeb094e5e832d24878749239578f44ae2acd42de01b43";
};
configureFlags = "--enable-nls";
inherit fontDirectories;
patchPhase = ''
@@ -39,7 +43,11 @@ stdenv.mkDerivation rec {
# this: ${concatStringsSep " " (map (f: "${f}") xorgserver.patches)}
xorgPatches = xorgserver.patches;
dontUseCmakeBuildDir = "yes";
postBuild = ''
export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -fpermissive -Wno-error=int-to-pointer-cast"
# Build Xvnc
tar xf ${xorgserver.src}
cp -R xorg*/* unix/xserver
@@ -48,19 +56,13 @@ stdenv.mkDerivation rec {
do
patch -p1 < $a
done
patch -p1 < ../xserver18.patch
patch -p1 < ../xserver113.patch
autoreconf -vfi
./configure $configureFlags --disable-xinerama --disable-xvfb --disable-xnest --disable-xorg --disable-dmx --disable-dri --disable-dri2 --disable-glx
./configure $configureFlags --disable-xinerama --disable-xvfb --disable-xnest --disable-xorg --disable-dmx --disable-dri --disable-dri2 --disable-glx --prefix="$out"
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
@@ -70,17 +72,20 @@ stdenv.mkDerivation rec {
buildInputs = (map (x : x.hostDrv) (buildInputs ++ [
fixesproto damageproto xcmiscproto bigreqsproto randrproto renderproto
fontsproto videoproto compositeproto scrnsaverproto resourceproto
libxkbfile libXfont libpciaccess
libxkbfile libXfont libpciaccess xineramaproto
]));
};
buildInputs =
[ libX11 libXext gettext libICE libXtst libXi libSM
nasm libgcrypt gnutls pam pixman
[ libX11 libXext gettext libICE libXtst libXi libSM libXft
nasm libgcrypt gnutls pam pixman libjpeg_turbo fltk xineramaproto
libXinerama libXcursor libxcrypt
];
buildNativeInputs =
[ autoconf automake cvs utilmacros fontutil libtool flex bison ]
[ autoconf automake cvs utilmacros fontutil libtool flex bison
cmake
]
++ xorgserver.buildNativeInputs;
propagatedBuildNativeInputs = xorgserver.propagatedBuildNativeInputs;