updatet qt4 to 4.4.0 and cleaned up the nix expression a little bit, breaks a lot of stuff depending on qt4 I suppose ;-)

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

pkgs/development/libraries/qt-4/default.nix

@@ -1,11 +1,42 @@
 args: with args;
-let common =
+stdenv.mkDerivation {
-rec {
+  name = "qt-4.4.0";
+  
+  src = fetchurl {
+    url = ftp://ftp.trolltech.com/qt/source/qt-x11-opensource-src-4.4.0.tar.bz2;
+    sha256 = "871dc71c6c905212f2fea7e6598362114a3b6097c220b0b251f8d159ee7d706e";
+  };
+  
   setupHook = ./setup-hook.sh;  
-  propagatedBuildInputs = [libXft libXrender libXrandr randrproto xextproto
+  propagatedBuildInputs = [
-  libXinerama xineramaproto libXcursor zlib libjpeg mysql libpng which mesa
+    libXft 
-  libXmu openssl dbus.libs cups pkgconfig libXext freetype fontconfig inputproto
+    libXrender 
-  fixesproto libXfixes glib libtiff];
+    libXrandr 
+    randrproto 
+    xextproto
+    libXinerama 
+    xineramaproto 
+    libXcursor 
+    zlib 
+    libjpeg 
+    mysql 
+    libpng 
+    which 
+    mesa
+    libXmu 
+    openssl 
+    dbus.libs 
+    cups 
+    pkgconfig 
+    libXext 
+    freetype 
+    fontconfig 
+    inputproto
+    fixesproto 
+    libXfixes 
+    glib 
+    libtiff
+  ];
   prefixKey = "-prefix ";
   configureFlags = "
     -v -no-separate-debug-info -release
@@ -14,25 +45,6 @@ rec {
     -opengl -xrender -xrandr -xinerama -xcursor -qt-sql-mysql
     -qdbus -cups -glib -xfixes
     -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";
-}; in
-rec {
-	trolltech = stdenv.mkDerivation (common // {
-	  name = "qt-4.3.3";
-	  src = fetchurl {
-		url = ftp://ftp.trolltech.com/qt/source/qt-x11-opensource-src-4.3.3.tar.gz;
-		sha256 = "0w0mfm0wwmbj1vnjn27rza1r9wj8k47mn9ril8swprffqnn4p4w9";
-	  };
-	  patchPhase = common.patchPhase;
-	});
-	kde = stdenv.mkDerivation (common // {
-	  name = "qt-kde-4.3svn";
-	  src = fetchsvn {
-		  url = svn://anonsvn.kde.org/home/kde/trunk/qt-copy;
-		  rev = "761061";
-		  sha256 = "0i98kh435dj29ln1lnidxwivcha1m553s4l8c1h2b3yd4950w8x4";
-	  };
-	  patchPhase = "mkdir .svn; bash apply_patches;" + common.patchPhase;
-	});
-	default = kde;
 }

pkgs/top-level/all-packages.nix

@@ -3133,17 +3133,13 @@ let pkgs = rec {
     mysqlSupport = getConfig ["qt" "mysql"] false;
   };
 
-  qt4 = getVersion "qt4" qt4_alts;
+  qt4 = import ../development/libraries/qt-4 {
-  
-  qt4_alts = import ../development/libraries/qt-4 {
     inherit fetchurl stdenv fetchsvn zlib libjpeg libpng which mysql mesa openssl cups dbus
     fontconfig freetype pkgconfig libtiff;
     inherit (xlibs) xextproto libXft libXrender libXrandr randrproto
     libXmu libXinerama xineramaproto libXcursor libICE libSM libX11 libXext
     inputproto fixesproto libXfixes;
     inherit (gnome) glib;
-    openglSupport = mesaSupported;
-    mysqlSupport = true;
   };
 
   readline = readline5;