public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Don't use environment.kdePackages; environment.systemPackages works

Browse Source 
just as well.

svn path=/nixos/trunk/; revision=24290
This commit is contained in:
Eelco Dolstra 2010-10-14 14:57:38 +00:00
parent 5e11683abc
commit 1b55007d63
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
modules/rename.nix
View File

@ -82,5 +82,6 @@ in zipModules ([]
# KDE # KDE
++ rename deprecated "kde.extraPackages" "environment.kdePackages" ++ rename deprecated "kde.extraPackages" "environment.kdePackages"
# ++ rename obsolete "environment.kdePackages" "environment.systemPackages" # !!! doesn't work!
) # do not add renaming after this. ) # do not add renaming after this.

8
modules/services/x11/desktop-managers/kde4.nix
View File

@ -23,7 +23,7 @@ in
default = []; default = [];
example = [ pkgs.kde4.kdesdk ]; example = [ pkgs.kde4.kdesdk ];
type = types.list types.package; 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 = { environment = {
kdePackages = [ systemPackages = [
pkgs.kde4.kdelibs pkgs.kde4.kdelibs
pkgs.kde4.kdebase pkgs.kde4.kdebase
pkgs.kde4.kdebase_runtime pkgs.kde4.kdebase_runtime
@ -69,9 +69,7 @@ in
pkgs.gst_all.gstPluginsGood pkgs.gst_all.gstPluginsGood
xorg.xmessage # so that startkde can show error messages xorg.xmessage # so that startkde can show error messages
xorg.xset # used by startkde, non-essential xorg.xset # used by startkde, non-essential
]; ] ++ config.environment.kdePackages;
x11Packages = config.environment.kdePackages;
pathsToLink = [ "/share" ]; pathsToLink = [ "/share" ];