Add qt-4.7.0-beta2

svn path=/nixpkgs/trunk/; revision=22830

2 files changed, 18 insertions, 12 deletions

diff --git a/pkgs/development/libraries/qt-4.x/4.7/default.nix b/pkgs/development/libraries/qt-4.x/4.7/default.nix
index fbcd8b24a33..148ce0820eb 100644
--- a/pkgs/development/libraries/qt-4.x/4.7/default.nix
+++ b/pkgs/development/libraries/qt-4.x/4.7/default.nix
@@ -2,17 +2,21 @@
 , alsaLib, gstreamer, gstPluginsBase, pulseaudio
 , libXft, libXrender, randrproto, xextproto, libXinerama, xineramaproto, libXcursor, libXmu
 , libXv, libXext, libXfixes, inputproto, fixesproto, libXrandr, freetype, fontconfig
-, zlib, libjpeg, libpng, which, mesa, openssl, dbus, cups, pkgconfig, libtiff, glib
+, zlib, libjpeg, libpng, libmng, which, mesa, openssl, dbus, cups, pkgconfig, libtiff, glib
 , mysql, postgresql, sqlite
 , perl, coreutils, libXi
 , buildDemos ? false, buildExamples ? false, useDocs ? true}:
 
+let
+  v = "4.7.0-beta2";
+in
+
 stdenv.mkDerivation rec {
-  name = "qt-4.7.0-beta1";
+  name = "qt-${v}";
   
   src = fetchurl {
-    url = ftp://ftp.qt.nokia.com/qt/source/qt-everywhere-opensource-src-4.7.0-beta1.tar.gz;
-    sha256 = "0ac9dk2xdcbwjmh9hgmnp60df9shv2ss78lls2apgnjddscdw1qi";
+    url = "ftp://ftp.qt.nokia.com/qt/source/qt-everywhere-opensource-src-${v}.tar.gz";
+    sha256 = "1gxckb5pxybnj5413dxk7dm8hm945ymm4ppqwg14wfk83zhnw6g0";
   };
   
   preConfigure = '' 
@@ -20,6 +24,7 @@ stdenv.mkDerivation rec {
     configureFlags+="
       -docdir $out/share/doc/${name}
       -plugindir $out/lib/qt4/plugins
+      -importdir $out/lib/qt4/imports
       -examplesdir $out/share/doc/${name}/examples
       -demosdir $out/share/doc/${name}/demos
       -datadir $out/share/qt4
@@ -40,6 +45,7 @@ stdenv.mkDerivation rec {
     libXcursor 
     zlib 
     libjpeg 
+    libmng
     mysql 
     postgresql
     libpng 
@@ -75,18 +81,18 @@ stdenv.mkDerivation rec {
 
   configureFlags = ''
     -v -no-separate-debug-info -release -fast -confirm-license -opensource
-    -system-zlib -system-libpng -system-libjpeg -qt-gif
+    -system-zlib -system-libpng -system-libjpeg -qt-gif -system-libmng
     -opengl -xrender -xrandr -xinerama -xcursor
     -plugin-sql-mysql -system-sqlite
     -qdbus -cups -glib -xfixes -dbus-linked
     -fontconfig -I${freetype}/include/freetype2
     -exceptions -xmlpatterns
-    -multimedia -mediaservices
+    -multimedia -audio-backend
+    -phonon -phonon-backend -svg
     -javascript-jit
     ${if buildDemos == true then "-make demos" else "-nomake demos"}
     ${if buildExamples == true then "-make examples" else "-nomake examples"}
-    ${if useDocs then "-make docs" else "-nomake docs"}
-  '';
+    ${if useDocs then "-make docs" else "-nomake docs"}'';
     
   patchPhase = ''
     substituteInPlace configure --replace /bin/pwd pwd
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 0c53e10f991..801fd71e6be 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5298,9 +5298,9 @@ let
   };
 
   qt47 = makeOverridable (import ../development/libraries/qt-4.x/4.7) {
-    inherit fetchurl stdenv zlib libjpeg libpng which mysql mesa openssl cups dbus
-      fontconfig freetype pkgconfig libtiff perl coreutils sqlite alsaLib
-      postgresql pulseaudio;
+    inherit fetchurl stdenv zlib libjpeg libpng libmng which mysql mesa openssl
+      cups dbus fontconfig freetype pkgconfig libtiff perl coreutils sqlite
+      alsaLib postgresql pulseaudio;
     inherit (gst_all) gstreamer gstPluginsBase;
     inherit (xlibs) xextproto libXft libXrender libXrandr randrproto
       libXmu libXinerama xineramaproto libXcursor libXext libXi
@@ -9568,7 +9568,7 @@ let
   kde4 = kde44;
 
   kde44 = makeOverridable (import ../desktops/kde-4.4) (pkgs // {
-    inherit openexr;
+    qt4 = qt46;
     stdenv = stdenv2;
   });