diff --git a/pkgs/development/libraries/qt-4/.default.nix.swp b/pkgs/development/libraries/qt-4/.default.nix.swp new file mode 100644 index 00000000000..0e8df16d5e8 Binary files /dev/null and b/pkgs/development/libraries/qt-4/.default.nix.swp differ diff --git a/pkgs/development/libraries/qt-4/default.nix b/pkgs/development/libraries/qt-4/default.nix index 20893e8d8d9..1fbdd362ff3 100644 --- a/pkgs/development/libraries/qt-4/default.nix +++ b/pkgs/development/libraries/qt-4/default.nix @@ -8,7 +8,7 @@ rec { fixesproto libXfixes glib libtiff]; prefixKey = "-prefix "; configureFlags = " - -v -no-separate-debug-info -release -nomake examples -nomake demos + -v -no-separate-debug-info -release -system-zlib -system-libpng -system-libjpeg -fast -qt-gif -confirm-license -opengl -xrender -xrandr -xinerama -xcursor -qt-sql-mysql @@ -18,10 +18,10 @@ rec { }; in rec { trolltech = stdenv.mkDerivation (common // { - name = "qt-4.3.1"; + name = "qt-4.3.3"; src = fetchurl { - url = ftp://ftp.trolltech.com/qt/source/qt-x11-opensource-src-4.3.1.tar.gz; - sha256 = "0qg6apy2r7jbbfinxh0v1jm08yv890r40hhmy5cysn239v3x0nad"; + url = ftp://ftp.trolltech.com/qt/source/qt-x11-opensource-src-4.3.3.tar.gz; + sha256 = "0w0mfm0wwmbj1vnjn27rza1r9wj8k47mn9ril8swprffqnn4p4w9"; }; patchPhase = common.patchPhase; }); @@ -29,8 +29,8 @@ rec { name = "qt-kde-4.3svn"; src = fetchsvn { url = svn://anonsvn.kde.org/home/kde/trunk/qt-copy; - rev = "732646"; - md5 = "9757de3dce16b483f2f358d287c848ee"; + rev = "746559"; + sha256 = "0lj2qp2q03m72kxdalrq6jfyrx33cg62ggvqww1c2f4aspvyijls"; }; patchPhase = "mkdir .svn; bash apply_patches;" + common.patchPhase; });