* An option to activate additional KDE packages.

svn path=/nixos/trunk/; revision=14888
This commit is contained in:
Eelco Dolstra 2009-04-05 19:10:34 +00:00
parent d5e97ab056
commit 4be528a72c
2 changed files with 19 additions and 1 deletions

View File

@ -3084,6 +3084,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 { passthru = mkOption {
default = {}; default = {};
description = " description = "
@ -3093,6 +3109,7 @@ root ALL=(ALL) SETENV: ALL
"; ";
}; };
require = [ require = [
# newtworking # newtworking
(import ../upstart-jobs/dhclient.nix) (import ../upstart-jobs/dhclient.nix)

View File

@ -280,7 +280,8 @@ rec {
++ pkgs.lib.optionals (config.services.xserver.sessionType == "kde") ++ pkgs.lib.optionals (config.services.xserver.sessionType == "kde")
[ pkgs.kdebase [ pkgs.kdebase
pkgs.kdelibs pkgs.kdelibs
]; ]
++ config.kde.extraPackages;
usersGroups = import ./users-groups.nix { inherit pkgs config upstartJobs defaultShell; }; usersGroups = import ./users-groups.nix { inherit pkgs config upstartJobs defaultShell; };