Author: eelco
Date: Thu Oct 14 14:57:38 2010
New Revision: 24290
URL: https://svn.nixos.org/websvn/nix/?rev=24290&sc=1
Log:
* Don't use environment.kdePackages; environment.systemPackages works
just as well.
Modified:
nixos/trunk/modules/rename.nix
nixos/trunk/modules/services/x11/desktop-managers/kde4.nix
Modified: nixos/trunk/modules/rename.nix
==============================================================================
--- nixos/trunk/modules/rename.nix Thu Oct 14 13:57:15 2010 (r24289)
+++ nixos/trunk/modules/rename.nix Thu Oct 14 14:57:38 2010 (r24290)
@@ -82,5 +82,6 @@
# KDE
++ rename deprecated "kde.extraPackages" "environment.kdePackages"
+# ++ rename obsolete "environment.kdePackages" "environment.systemPackages" #
!!! doesn't work!
) # do not add renaming after this.
Modified: nixos/trunk/modules/services/x11/desktop-managers/kde4.nix
==============================================================================
--- nixos/trunk/modules/services/x11/desktop-managers/kde4.nix Thu Oct 14
13:57:15 2010 (r24289)
+++ nixos/trunk/modules/services/x11/desktop-managers/kde4.nix Thu Oct 14
14:57:38 2010 (r24290)
@@ -23,7 +23,7 @@
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 @@
} ];
environment = {
- kdePackages = [
+ systemPackages = [
pkgs.kde4.kdelibs
pkgs.kde4.kdebase
pkgs.kde4.kdebase_runtime
@@ -69,9 +69,7 @@
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" ];
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
