From 4be528a72c3a92cd91bbff30f16144c73e384616 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sun, 5 Apr 2009 19:10:34 +0000
Subject: [PATCH] * An option to activate additional KDE packages.

svn path=/nixos/trunk/; revision=14888
---
 system/options.nix | 17 +++++++++++++++++
 system/system.nix  |  3 ++-
 2 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/system/options.nix b/system/options.nix
index 59c3001df3bb..9128e794e025 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -3083,6 +3083,22 @@ root        ALL=(ALL) SETENV: ALL
     };
   };
 
+
+  kde = {
+
+    extraPackages = mkOption {
+      default = [];
+      merge = backwardPkgsFunListMerge;
+      description = ''
+        Additional KDE packages to be used when
+        <option>services.xserver.sessionType</option> is
+        <literal>"kde"</literal> or <literal>"kde4"</literal>.
+        By default, you only get the KDE base packages.
+      '';
+    };
+  
+  };
+
   
   passthru = mkOption {
     default = {};
@@ -3093,6 +3109,7 @@ root        ALL=(ALL) SETENV: ALL
     ";
   };
 
+  
   require = [
     # newtworking
     (import ../upstart-jobs/dhclient.nix)
diff --git a/system/system.nix b/system/system.nix
index 7fc5974cc394..607195ab0cbe 100644
--- a/system/system.nix
+++ b/system/system.nix
@@ -280,7 +280,8 @@ rec {
     ++ pkgs.lib.optionals (config.services.xserver.sessionType == "kde")
       [ pkgs.kdebase
         pkgs.kdelibs
-      ];
+      ]
+    ++ config.kde.extraPackages;
 
 
   usersGroups = import ./users-groups.nix { inherit pkgs config upstartJobs defaultShell; };