Update TigerVNC to SVN checkout that at least builds..
This commit is contained in:
parent
76c010b928
commit
0e930058ae
@ -1936,6 +1936,16 @@ let
|
|||||||
};
|
};
|
||||||
buildInputs = [pkgconfig renderproto libdrm openssl libX11 libXau libXaw libXdmcp libXfixes libxkbfile libXmu libXpm libXrender libXres libXt libXv ];
|
buildInputs = [pkgconfig renderproto libdrm openssl libX11 libXau libXaw libXdmcp libXfixes libxkbfile libXmu libXpm libXrender libXres libXt libXv ];
|
||||||
})) // {inherit renderproto libdrm openssl libX11 libXau libXaw libXdmcp libXfixes libxkbfile libXmu libXpm libXrender libXres libXt libXv ;};
|
})) // {inherit renderproto libdrm openssl libX11 libXau libXaw libXdmcp libXfixes libxkbfile libXmu libXpm libXrender libXres libXt libXv ;};
|
||||||
|
|
||||||
|
xorgserver_1_13_0 = (stdenv.mkDerivation ((if overrides ? xorgserver_1_13_0 then overrides.xorgserver_1_13_0 else x: x) {
|
||||||
|
name = "xorg-server-1.13.0";
|
||||||
|
builder = ./builder.sh;
|
||||||
|
src = fetchurl {
|
||||||
|
url = mirror://xorg/individual/xserver/xorg-server-1.13.0.tar.bz2;
|
||||||
|
sha256 = "12pjis236ss3402cg1iy749cylajjp27m3j2jbwd8yh8075r32sl";
|
||||||
|
};
|
||||||
|
buildInputs = [pkgconfig renderproto libdrm openssl libX11 libXau libXaw libXdmcp libXfixes libxkbfile libXmu libXpm libXrender libXres libXt libXv pixman glproto ];
|
||||||
|
})) // {inherit renderproto libdrm openssl libX11 libXau libXaw libXdmcp libXfixes libxkbfile libXmu libXpm libXrender libXres libXt libXv pixman glproto ;};
|
||||||
|
|
||||||
xorgsgmldoctools = (stdenv.mkDerivation ((if overrides ? xorgsgmldoctools then overrides.xorgsgmldoctools else x: x) {
|
xorgsgmldoctools = (stdenv.mkDerivation ((if overrides ? xorgsgmldoctools then overrides.xorgsgmldoctools else x: x) {
|
||||||
name = "xorg-sgml-doctools-1.11";
|
name = "xorg-sgml-doctools-1.11";
|
||||||
|
@ -1,8 +1,7 @@
|
|||||||
mirror://xorg/individual/driver/xf86-video-intel-2.14.901.tar.bz2:xf86videointel_2_14_901
|
|
||||||
mirror://xorg/individual/driver/xf86-video-intel-2.17.0.tar.bz2:xf86videointel_2_17_0
|
|
||||||
mirror://xorg/individual/lib/pixman-0.26.2.tar.bz2
|
mirror://xorg/individual/lib/pixman-0.26.2.tar.bz2
|
||||||
mirror://xorg/individual/xcb/xcb-util-0.3.9.tar.bz2
|
mirror://xorg/individual/xcb/xcb-util-0.3.9.tar.bz2
|
||||||
mirror://xorg/individual/xcb/xcb-util-image-0.3.9.tar.bz2
|
mirror://xorg/individual/xcb/xcb-util-image-0.3.9.tar.bz2
|
||||||
mirror://xorg/individual/xcb/xcb-util-keysyms-0.3.9.tar.bz2
|
mirror://xorg/individual/xcb/xcb-util-keysyms-0.3.9.tar.bz2
|
||||||
mirror://xorg/individual/xcb/xcb-util-renderutil-0.3.8.tar.bz2
|
mirror://xorg/individual/xcb/xcb-util-renderutil-0.3.8.tar.bz2
|
||||||
mirror://xorg/individual/xcb/xcb-util-wm-0.3.9.tar.bz2
|
mirror://xorg/individual/xcb/xcb-util-wm-0.3.9.tar.bz2
|
||||||
|
mirror://xorg/individual/xserver/xorg-server-1.13.0.tar.bz2:xorgserver_1_13_0
|
||||||
|
@ -230,6 +230,29 @@ in
|
|||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
|
|
||||||
|
xorgserver_1_13_0 = attrs: attrs // {
|
||||||
|
configureFlags = "--enable-xcsecurity"; # enable SECURITY extension
|
||||||
|
patches = [./xorgserver-dri-path.patch ./xorgserver-xkbcomp-path.patch];
|
||||||
|
buildInputs = attrs.buildInputs ++
|
||||||
|
[ args.zlib args.udev args.mesa args.dbus.libs
|
||||||
|
xorg.xf86bigfontproto xorg.glproto xorg.xf86driproto
|
||||||
|
xorg.compositeproto xorg.scrnsaverproto xorg.resourceproto
|
||||||
|
xorg.xineramaproto xorg.xf86dgaproto
|
||||||
|
xorg.dmxproto xorg.libdmx xorg.xf86vidmodeproto
|
||||||
|
xorg.recordproto xorg.libXext xorg.pixman xorg.libXfont
|
||||||
|
xorg.damageproto xorg.xcmiscproto xorg.xtrans xorg.bigreqsproto
|
||||||
|
];
|
||||||
|
propagatedBuildInputs =
|
||||||
|
[ xorg.libpciaccess xorg.inputproto xorg.xextproto xorg.randrproto
|
||||||
|
xorg.dri2proto xorg.kbproto
|
||||||
|
];
|
||||||
|
postInstall =
|
||||||
|
''
|
||||||
|
rm -fr $out/share/X11/xkb/compiled
|
||||||
|
ln -s /var/tmp $out/share/X11/xkb/compiled
|
||||||
|
'';
|
||||||
|
};
|
||||||
|
|
||||||
libSM = attrs: attrs
|
libSM = attrs: attrs
|
||||||
// { propagatedBuildInputs = [ xorg.libICE ]; }
|
// { propagatedBuildInputs = [ xorg.libICE ]; }
|
||||||
// args.stdenv.lib.optionalAttrs (args.stdenv.system == "i686-darwin") {
|
// args.stdenv.lib.optionalAttrs (args.stdenv.system == "i686-darwin") {
|
||||||
|
@ -3,21 +3,25 @@
|
|||||||
, fontDirectories, fontutil, libgcrypt, gnutls, pam, flex, bison
|
, fontDirectories, fontutil, libgcrypt, gnutls, pam, flex, bison
|
||||||
, fixesproto, damageproto, xcmiscproto, bigreqsproto, randrproto, renderproto
|
, fixesproto, damageproto, xcmiscproto, bigreqsproto, randrproto, renderproto
|
||||||
, fontsproto, videoproto, compositeproto, scrnsaverproto, resourceproto
|
, fontsproto, videoproto, compositeproto, scrnsaverproto, resourceproto
|
||||||
, libxkbfile, libXfont, libpciaccess
|
, libxkbfile, libXfont, libpciaccess, cmake, libjpeg_turbo, libXft, fltk, libXinerama
|
||||||
|
, xineramaproto, libXcursor, fetchsvn, libxcrypt
|
||||||
}:
|
}:
|
||||||
|
|
||||||
with stdenv.lib;
|
with stdenv.lib;
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
name = "tigervnc-1.1.0";
|
# Release version = "1.2.0";
|
||||||
|
revision = 5005;
|
||||||
|
version = "r${toString revision}";
|
||||||
|
name = "tigervnc-${version}";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchsvn {
|
||||||
url = "mirror://sourceforge/tigervnc/${name}.tar.gz";
|
# Release url = "mirror://sourceforge/tigervnc/${version}/${name}.tar.gz";
|
||||||
sha256 = "1x30s12fwv9rk0fnwwn631qq0d8rpjjx53bvzlx8c91cba170jsr";
|
url = "https://tigervnc.svn.sourceforge.net/svnroot/tigervnc/trunk";
|
||||||
|
rev = revision;
|
||||||
|
sha256 = "2401e0ede9a2d50a37caeb094e5e832d24878749239578f44ae2acd42de01b43";
|
||||||
};
|
};
|
||||||
|
|
||||||
configureFlags = "--enable-nls";
|
|
||||||
|
|
||||||
inherit fontDirectories;
|
inherit fontDirectories;
|
||||||
|
|
||||||
patchPhase = ''
|
patchPhase = ''
|
||||||
@ -39,7 +43,11 @@ stdenv.mkDerivation rec {
|
|||||||
# this: ${concatStringsSep " " (map (f: "${f}") xorgserver.patches)}
|
# this: ${concatStringsSep " " (map (f: "${f}") xorgserver.patches)}
|
||||||
xorgPatches = xorgserver.patches;
|
xorgPatches = xorgserver.patches;
|
||||||
|
|
||||||
|
dontUseCmakeBuildDir = "yes";
|
||||||
|
|
||||||
postBuild = ''
|
postBuild = ''
|
||||||
|
export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -fpermissive -Wno-error=int-to-pointer-cast"
|
||||||
|
|
||||||
# Build Xvnc
|
# Build Xvnc
|
||||||
tar xf ${xorgserver.src}
|
tar xf ${xorgserver.src}
|
||||||
cp -R xorg*/* unix/xserver
|
cp -R xorg*/* unix/xserver
|
||||||
@ -48,19 +56,13 @@ stdenv.mkDerivation rec {
|
|||||||
do
|
do
|
||||||
patch -p1 < $a
|
patch -p1 < $a
|
||||||
done
|
done
|
||||||
patch -p1 < ../xserver18.patch
|
patch -p1 < ../xserver113.patch
|
||||||
autoreconf -vfi
|
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`/../..
|
make TIGERVNC_SRCDIR=`pwd`/../..
|
||||||
popd
|
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 = ''
|
postInstall = ''
|
||||||
pushd unix/xserver
|
pushd unix/xserver
|
||||||
make TIGERVNC_SRCDIR=`pwd`/../.. install
|
make TIGERVNC_SRCDIR=`pwd`/../.. install
|
||||||
@ -70,17 +72,20 @@ stdenv.mkDerivation rec {
|
|||||||
buildInputs = (map (x : x.hostDrv) (buildInputs ++ [
|
buildInputs = (map (x : x.hostDrv) (buildInputs ++ [
|
||||||
fixesproto damageproto xcmiscproto bigreqsproto randrproto renderproto
|
fixesproto damageproto xcmiscproto bigreqsproto randrproto renderproto
|
||||||
fontsproto videoproto compositeproto scrnsaverproto resourceproto
|
fontsproto videoproto compositeproto scrnsaverproto resourceproto
|
||||||
libxkbfile libXfont libpciaccess
|
libxkbfile libXfont libpciaccess xineramaproto
|
||||||
]));
|
]));
|
||||||
};
|
};
|
||||||
|
|
||||||
buildInputs =
|
buildInputs =
|
||||||
[ libX11 libXext gettext libICE libXtst libXi libSM
|
[ libX11 libXext gettext libICE libXtst libXi libSM libXft
|
||||||
nasm libgcrypt gnutls pam pixman
|
nasm libgcrypt gnutls pam pixman libjpeg_turbo fltk xineramaproto
|
||||||
|
libXinerama libXcursor libxcrypt
|
||||||
];
|
];
|
||||||
|
|
||||||
buildNativeInputs =
|
buildNativeInputs =
|
||||||
[ autoconf automake cvs utilmacros fontutil libtool flex bison ]
|
[ autoconf automake cvs utilmacros fontutil libtool flex bison
|
||||||
|
cmake
|
||||||
|
]
|
||||||
++ xorgserver.buildNativeInputs;
|
++ xorgserver.buildNativeInputs;
|
||||||
|
|
||||||
propagatedBuildNativeInputs = xorgserver.propagatedBuildNativeInputs;
|
propagatedBuildNativeInputs = xorgserver.propagatedBuildNativeInputs;
|
||||||
|
@ -1616,6 +1616,8 @@ let
|
|||||||
tigervnc = callPackage ../tools/admin/tigervnc {
|
tigervnc = callPackage ../tools/admin/tigervnc {
|
||||||
fontDirectories = [ xorg.fontadobe75dpi xorg.fontmiscmisc xorg.fontcursormisc
|
fontDirectories = [ xorg.fontadobe75dpi xorg.fontmiscmisc xorg.fontcursormisc
|
||||||
xorg.fontbhlucidatypewriter75dpi ];
|
xorg.fontbhlucidatypewriter75dpi ];
|
||||||
|
xorgserver = xorg.xorgserver_1_13_0;
|
||||||
|
fltk = fltk13;
|
||||||
};
|
};
|
||||||
|
|
||||||
tightvnc = callPackage ../tools/admin/tightvnc {
|
tightvnc = callPackage ../tools/admin/tightvnc {
|
||||||
|
Loading…
x
Reference in New Issue
Block a user