qt-4: 4.3.3 and sv-746559

svn path=/nixpkgs/branches/stdenv-updates/; revision=9915
This commit is contained in:
Yury G. Kudryashov 2007-12-12 00:21:12 +00:00
parent ccb13fd637
commit 8dd9e323ff
2 changed files with 6 additions and 6 deletions

Binary file not shown.

View File

@ -8,7 +8,7 @@ rec {
fixesproto libXfixes glib libtiff]; 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
-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
@ -18,10 +18,10 @@ rec {
}; in }; in
rec { rec {
trolltech = stdenv.mkDerivation (common // { trolltech = stdenv.mkDerivation (common // {
name = "qt-4.3.1"; name = "qt-4.3.3";
src = fetchurl { src = fetchurl {
url = ftp://ftp.trolltech.com/qt/source/qt-x11-opensource-src-4.3.1.tar.gz; url = ftp://ftp.trolltech.com/qt/source/qt-x11-opensource-src-4.3.3.tar.gz;
sha256 = "0qg6apy2r7jbbfinxh0v1jm08yv890r40hhmy5cysn239v3x0nad"; sha256 = "0w0mfm0wwmbj1vnjn27rza1r9wj8k47mn9ril8swprffqnn4p4w9";
}; };
patchPhase = common.patchPhase; patchPhase = common.patchPhase;
}); });
@ -29,8 +29,8 @@ 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;
rev = "732646"; rev = "746559";
md5 = "9757de3dce16b483f2f358d287c848ee"; sha256 = "0lj2qp2q03m72kxdalrq6jfyrx33cg62ggvqww1c2f4aspvyijls";
}; };
patchPhase = "mkdir .svn; bash apply_patches;" + common.patchPhase; patchPhase = "mkdir .svn; bash apply_patches;" + common.patchPhase;
}); });