* Make the KDE modules work with KDE 4.2 and 4.3. Also, when using

  KDE 4.3, add Qt 4.5 instead of Qt 4.4 to the system path.

svn path=/nixos/trunk/; revision=17085

3 files changed, 9 insertions, 10 deletions

diff --git a/modules/services/x11/desktop-managers/kde-environment.nix b/modules/services/x11/desktop-managers/kde-environment.nix
index e868ab78f4b..6053832a3c3 100644
--- a/modules/services/x11/desktop-managers/kde-environment.nix
+++ b/modules/services/x11/desktop-managers/kde-environment.nix
@@ -24,7 +24,7 @@ let
 
       kdePackages = mkOption {
         default = [];
-        example = [ pkgs.kde43.kdegames ];
+        example = [ pkgs.kde4.kdegames ];
         type = types.list types.package;
         description = ''
           Additional KDE packages to be used when you use KDE as a desktop
diff --git a/modules/services/x11/desktop-managers/kde4.nix b/modules/services/x11/desktop-managers/kde4.nix
index 8a4800f7d0a..a4c63616347 100644
--- a/modules/services/x11/desktop-managers/kde4.nix
+++ b/modules/services/x11/desktop-managers/kde4.nix
@@ -40,24 +40,23 @@ in
         start =
           ''
             # Start KDE.
-            exec ${pkgs.kde43.kdebase_workspace}/bin/startkde
+            exec ${pkgs.kde4.kdebase_workspace}/bin/startkde
           '';
       };
 
     security.setuidPrograms = [ "kcheckpass" ];
 
     environment.kdePackages =
-      [ pkgs.kde43.kdelibs
-        pkgs.kde43.kdebase
-        pkgs.kde43.kdebase_runtime
-        pkgs.kde43.kdebase_workspace
-	pkgs.kde43.oxygen_icons
+      [ pkgs.kde4.kdelibs
+        pkgs.kde4.kdebase
+        pkgs.kde4.kdebase_runtime
+        pkgs.kde4.kdebase_workspace
         pkgs.shared_mime_info
-      ];
+      ] ++ optional (pkgs.kde4 ? oxygen_icons) pkgs.kde4.oxygen_icons;
 
     environment.x11Packages =
       [ xorg.xmessage # so that startkde can show error messages
-        pkgs.qt4 # needed for qdbus
+        pkgs.kde4.qt4 # needed for qdbus
         xorg.xset # used by startkde, non-essential
       ];
 
diff --git a/modules/services/x11/display-managers/kdm.nix b/modules/services/x11/display-managers/kdm.nix
index 62d9c609ce6..1b3b2080920 100644
--- a/modules/services/x11/display-managers/kdm.nix
+++ b/modules/services/x11/display-managers/kdm.nix
@@ -7,7 +7,7 @@ let
   dmcfg = config.services.xserver.displayManager;
   cfg = dmcfg.kdm;
 
-  inherit (pkgs.kde43) kdebase_workspace;
+  inherit (pkgs.kde4) kdebase_workspace;
 
   defaultConfig =
     ''