From 297889f05c192d941478da392004f9cb0cefedc6 Mon Sep 17 00:00:00 2001
From: Sander van der Burg <s.vanderburg@tudelft.nl>
Date: Fri, 11 Sep 2009 10:43:13 +0000
Subject: [PATCH] Switched KDE 4.2 to KDE 4.3

svn path=/nixos/trunk/; revision=17043
---
 modules/services/x11/desktop-managers/kde4.nix | 11 ++++++-----
 modules/services/x11/display-managers/kdm.nix  |  2 +-
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/modules/services/x11/desktop-managers/kde4.nix b/modules/services/x11/desktop-managers/kde4.nix
index b8edf73815b..8a4800f7d0a 100644
--- a/modules/services/x11/desktop-managers/kde4.nix
+++ b/modules/services/x11/desktop-managers/kde4.nix
@@ -40,17 +40,18 @@ in
         start =
           ''
             # Start KDE.
-            exec ${pkgs.kde42.kdebase_workspace}/bin/startkde
+            exec ${pkgs.kde43.kdebase_workspace}/bin/startkde
           '';
       };
 
     security.setuidPrograms = [ "kcheckpass" ];
 
     environment.kdePackages =
-      [ pkgs.kde42.kdelibs
-        pkgs.kde42.kdebase
-        pkgs.kde42.kdebase_runtime
-        pkgs.kde42.kdebase_workspace
+      [ pkgs.kde43.kdelibs
+        pkgs.kde43.kdebase
+        pkgs.kde43.kdebase_runtime
+        pkgs.kde43.kdebase_workspace
+	pkgs.kde43.oxygen_icons
         pkgs.shared_mime_info
       ];
 
diff --git a/modules/services/x11/display-managers/kdm.nix b/modules/services/x11/display-managers/kdm.nix
index 55ab406b9e9..62d9c609ce6 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.kde42) kdebase_workspace;
+  inherit (pkgs.kde43) kdebase_workspace;
 
   defaultConfig =
     ''