From 1b55007d635db29ee3273f7c6cde8c9809abaf5c Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 14 Oct 2010 14:57:38 +0000
Subject: [PATCH] * Don't use environment.kdePackages;
 environment.systemPackages works   just as well.

svn path=/nixos/trunk/; revision=24290
---
 modules/rename.nix                             | 1 +
 modules/services/x11/desktop-managers/kde4.nix | 8 +++-----
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/modules/rename.nix b/modules/rename.nix
index a6cb65cb9900..2d5a938c6281 100644
--- a/modules/rename.nix
+++ b/modules/rename.nix
@@ -82,5 +82,6 @@ in zipModules ([]
 
 # KDE
 ++ rename deprecated "kde.extraPackages" "environment.kdePackages"
+# ++ rename obsolete "environment.kdePackages" "environment.systemPackages" # !!! doesn't work!
 
 ) # do not add renaming after this.
diff --git a/modules/services/x11/desktop-managers/kde4.nix b/modules/services/x11/desktop-managers/kde4.nix
index 5ed501e4b020..2841c9426ff0 100644
--- a/modules/services/x11/desktop-managers/kde4.nix
+++ b/modules/services/x11/desktop-managers/kde4.nix
@@ -23,7 +23,7 @@ in
       default = [];
       example = [ pkgs.kde4.kdesdk ];
       type = types.list types.package;
-      description = "Additional KDE 4 programs. Only a minimal set is installed by default.";
+      description = "This option is obsolete.  Please use <option>environment.systemPackages</option> instead.";
     };
 
   };
@@ -56,7 +56,7 @@ in
     } ];
 
     environment = {
-      kdePackages = [
+      systemPackages = [
         pkgs.kde4.kdelibs
         pkgs.kde4.kdebase
         pkgs.kde4.kdebase_runtime
@@ -69,9 +69,7 @@ in
         pkgs.gst_all.gstPluginsGood
         xorg.xmessage # so that startkde can show error messages
         xorg.xset # used by startkde, non-essential
-      ];
-
-      x11Packages = config.environment.kdePackages;
+      ] ++ config.environment.kdePackages;
 
       pathsToLink = [ "/share" ];