diff --git a/modules/rename.nix b/modules/rename.nix index a6cb65cb990..2d5a938c628 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 5ed501e4b02..2841c9426ff 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 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" ];