* qt-4 -> qt-4.4.

* kde-4.2 shouldn't depend on poppler built with qt 4.5.

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

5 files changed, 27 insertions, 17 deletions

diff --git a/pkgs/desktops/kde-4.2/default.nix b/pkgs/desktops/kde-4.2/default.nix
index 3901cd71e2f44..ac73e161c2531 100644
--- a/pkgs/desktops/kde-4.2/default.nix
+++ b/pkgs/desktops/kde-4.2/default.nix
@@ -1,6 +1,8 @@
 pkgs:
 
 rec {
+  inherit (pkgs) qt4;
+  
 ### SUPPORT
   automoc4 = import ./support/automoc4 {
     inherit (pkgs) stdenv fetchurl cmake;
diff --git a/pkgs/desktops/kde-4.3/default.nix b/pkgs/desktops/kde-4.3/default.nix
index 9c439a4e653ea..bc5c6d32db4ea 100644
--- a/pkgs/desktops/kde-4.3/default.nix
+++ b/pkgs/desktops/kde-4.3/default.nix
@@ -1,6 +1,8 @@
 pkgs:
 
 rec {
+  inherit (pkgs) qt4;
+
 ### SUPPORT
   automoc4 = import ./support/automoc4 {
     inherit (pkgs) stdenv fetchurl lib cmake;
diff --git a/pkgs/development/libraries/qt-4/default.nix b/pkgs/development/libraries/qt-4.4/default.nix
index a378a9dd94b4c..a378a9dd94b4c 100644
--- a/pkgs/development/libraries/qt-4/default.nix
+++ b/pkgs/development/libraries/qt-4.4/default.nix
diff --git a/pkgs/development/libraries/qt-4/setup-hook.sh b/pkgs/development/libraries/qt-4.4/setup-hook.sh
index f9ecacbbb7df0..f9ecacbbb7df0 100644
--- a/pkgs/development/libraries/qt-4/setup-hook.sh
+++ b/pkgs/development/libraries/qt-4.4/setup-hook.sh
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 05eefd989031c..1da4b1ee64386 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3997,21 +3997,22 @@ let
     dbus = dbus.libs;
   };
 
-  poppler = import ../development/libraries/poppler {
-    inherit fetchurl stdenv qt4 cairo freetype fontconfig zlib libjpeg
-      pkgconfig;
+  poppler = makeOverridable (import ../development/libraries/poppler) {
+    inherit fetchurl stdenv cairo freetype fontconfig zlib libjpeg pkgconfig;
     inherit (gtkLibs) glib gtk;
-    qt4Support = getConfig [ "poppler" "qt4Support" ] false;
+    qt4Support = false;
   };
 
-  popplerQt4 = import ../development/libraries/poppler {
-    inherit fetchurl stdenv cairo freetype fontconfig zlib libjpeg
-      pkgconfig;
-    qt4 = qt45;
-    inherit (gtkLibs) glib gtk;
+  popplerQt44 = poppler.override {
     qt4Support = true;
+    qt4 = qt44;
   };
-
+  
+  popplerQt45 = poppler.override {
+    qt4Support = true;
+    qt4 = qt45;
+  };
+  
   popt = import ../development/libraries/popt {
     inherit fetchurl stdenv;
   };
@@ -4040,21 +4041,23 @@ let
     mysqlSupport = true;
   };
 
-  qt4 = import ../development/libraries/qt-4 {
+  qt4 = qt44;
+
+  qt44 = import ../development/libraries/qt-4.4 {
     inherit fetchurl stdenv fetchsvn zlib libjpeg libpng which mysql mesa openssl cups dbus
-    fontconfig freetype pkgconfig libtiff;
+      fontconfig freetype pkgconfig libtiff;
     inherit (xlibs) xextproto libXft libXrender libXrandr randrproto
-    libXmu libXinerama xineramaproto libXcursor libICE libSM libX11 libXext
-    inputproto fixesproto libXfixes;
+      libXmu libXinerama xineramaproto libXcursor libICE libSM libX11 libXext
+      inputproto fixesproto libXfixes;
     inherit (gnome) glib;
   };
 
   qt45 = import ../development/libraries/qt-4.5 {
     inherit fetchurl stdenv lib zlib libjpeg libpng which mysql mesa openssl cups dbus
-    fontconfig freetype pkgconfig libtiff;
+      fontconfig freetype pkgconfig libtiff;
     inherit (xlibs) xextproto libXft libXrender libXrandr randrproto
-    libXmu libXinerama xineramaproto libXcursor libXext
-    inputproto fixesproto libXfixes;
+      libXmu libXinerama xineramaproto libXcursor libXext
+      inputproto fixesproto libXfixes;
     inherit (gnome) glib;
   };
   
@@ -7851,11 +7854,14 @@ let
 
   kde42 = import ../desktops/kde-4.2 (pkgs // {
     openexr = openexr_1_6_1;
+    qt4 = qt44;
+    popplerQt4 = popplerQt44;
   });
   
   kde43 = import ../desktops/kde-4.3 (pkgs // {
     openexr = openexr_1_6_1;
     qt4 = qt45;
+    popplerQt4 = popplerQt45;
   });
   
   kdelibs = kde3.kdelibs;