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

qt-4 (kde version) upgrade, added libtiff to qt-4 dependencies

Browse Source 
svn path=/nixpkgs/trunk/; revision=9632
This commit is contained in:
Yury G. Kudryashov 2007-11-11 15:56:30 +00:00
parent 913cc6983e
commit 17b0f144f7
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkgs/development/libraries/qt-4/default.nix
View File

@ -5,14 +5,14 @@ rec {
propagatedBuildInputs = [libXft libXrender libXrandr randrproto xextproto propagatedBuildInputs = [libXft libXrender libXrandr randrproto xextproto
libXinerama xineramaproto libXcursor zlib libjpeg mysql libpng which mesa libXinerama xineramaproto libXcursor zlib libjpeg mysql libpng which mesa
libXmu openssl dbus cups pkgconfig libXext freetype fontconfig inputproto libXmu openssl dbus cups pkgconfig libXext freetype fontconfig inputproto
fixesproto libXfixes glib]; fixesproto libXfixes glib libtiff];
prefixKey = "-prefix "; prefixKey = "-prefix ";
configureFlags = " configureFlags = "
-v -no-separate-debug-info -release -nomake examples -nomake demos -v -no-separate-debug-info -release -nomake examples -nomake demos
-system-zlib -system-libpng -system-libjpeg -fast -system-zlib -system-libpng -system-libjpeg -fast
-qt-gif -confirm-license -qt-gif -confirm-license
-opengl -xrender -xrandr -xinerama -xcursor -qt-sql-mysql -opengl -xrender -xrandr -xinerama -xcursor -qt-sql-mysql
-L${mysql}/lib/mysql -I${mysql}/include/mysql -qdbus -cups -glib -xfixes -qdbus -cups -glib -xfixes
-fontconfig -I${freetype}/include/freetype2"; -fontconfig -I${freetype}/include/freetype2";
patchPhase = "sed -e 's@/bin/pwd@pwd@' -i configure; sed -e 's@/usr@/FOO@' -i config.tests/*/*.test -i mkspecs/*/*.conf"; patchPhase = "sed -e 's@/bin/pwd@pwd@' -i configure; sed -e 's@/usr@/FOO@' -i config.tests/*/*.test -i mkspecs/*/*.conf";
}; in }; in
@ -29,9 +29,10 @@ rec {
name = "qt-kde-4.3svn"; name = "qt-kde-4.3svn";
src = fetchsvn { src = fetchsvn {
url = svn://anonsvn.kde.org/home/kde/trunk/qt-copy; url = svn://anonsvn.kde.org/home/kde/trunk/qt-copy;
md5 = "b0588d8ef36642613bdb92930a2330b4"; rev = "732646";
md5 = "9757de3dce16b483f2f358d287c848ee";
}; };
patchPhase = "mkdir .svn; bash apply_patches;patch -R -p0 < patches/0172-prefer-xrandr-over-xinerama.diff;" + common.patchPhase; patchPhase = "mkdir .svn; bash apply_patches;" + common.patchPhase;
}); });
default = kde; default = kde;
} }

4
pkgs/top-level/all-packages.nix
View File

@ -2158,11 +2158,9 @@ rec {
}; };
qt4 = getVersion "qt4" qt4_alts; qt4 = getVersion "qt4" qt4_alts;
# Builds, but not tested yet
# There are two versions: kde and trolltech
qt4_alts = import ../development/libraries/qt-4 { qt4_alts = import ../development/libraries/qt-4 {
inherit fetchurl fetchsvn zlib libjpeg libpng which mysql mesa openssl cups dbus inherit fetchurl fetchsvn zlib libjpeg libpng which mysql mesa openssl cups dbus
fontconfig freetype pkgconfig; fontconfig freetype pkgconfig libtiff;
inherit (xlibs) xextproto libXft libXrender libXrandr randrproto inherit (xlibs) xextproto libXft libXrender libXrandr randrproto
libXmu libXinerama xineramaproto libXcursor libICE libSM libX11 libXext libXmu libXinerama xineramaproto libXcursor libICE libSM libX11 libXext
inputproto fixesproto libXfixes; inputproto fixesproto libXfixes;