Remove KDE3 desktop
We have no full KDE3 desktop anyway. KDE3 desktop was broken for a while, and nobody noticed. svn path=/nixos/trunk/; revision=21996
This commit is contained in:
Yury G. Kudryashov
parent
fa89713c78
commit
32d41f439d
|
|
@ -114,8 +114,6 @@
|
|||
./services/web-servers/tomcat.nix
|
||||
./services/x11/desktop-managers/default.nix
|
||||
./services/x11/desktop-managers/gnome.nix
|
||||
./services/x11/desktop-managers/kde-environment.nix
|
||||
./services/x11/desktop-managers/kde.nix
|
||||
./services/x11/desktop-managers/kde4.nix
|
||||
./services/x11/desktop-managers/none.nix
|
||||
./services/x11/desktop-managers/xterm.nix
|
||||
|
|
|
|||
|
|
@ -12,7 +12,6 @@ in
|
|||
|
||||
{
|
||||
imports = [
|
||||
./kde.nix
|
||||
./kde4.nix
|
||||
./gnome.nix
|
||||
./xterm.nix
|
||||
|
|
|
|||
|
|
@ -1,35 +0,0 @@
|
|||
{pkgs, config, ...}:
|
||||
|
||||
let
|
||||
inherit (pkgs.lib) mkDefaultValue mkOption mkIf types;
|
||||
kdePackages = config.environment.kdePackages;
|
||||
|
||||
options = {
|
||||
|
||||
environment = {
|
||||
|
||||
kdePackages = mkOption {
|
||||
default = [];
|
||||
example = [ pkgs.kde4.kdegames ];
|
||||
type = types.list types.package;
|
||||
description = ''
|
||||
Additional KDE packages to be used when you use KDE as a desktop
|
||||
manager. By default, you only get the KDE base packages.
|
||||
Just adds packages to systemPackages and x11Packages. Will be removed
|
||||
in the future.
|
||||
'';
|
||||
};
|
||||
|
||||
};
|
||||
};
|
||||
in
|
||||
|
||||
mkIf (kdePackages != [] && config.services.xserver.enable) {
|
||||
require = options;
|
||||
|
||||
environment = {
|
||||
x11Packages = kdePackages;
|
||||
systemPackages = kdePackages;
|
||||
pathsToLink = [ "/etc/xdg" "/etc/dbus-1" "/share" "/plugins" ];
|
||||
};
|
||||
}
|
||||
|
|
@ -1,73 +0,0 @@
|
|||
{pkgs, config, ...}:
|
||||
|
||||
let
|
||||
inherit (pkgs.lib) mkOption mkIf;
|
||||
xcfg = config.services.xserver;
|
||||
cfg = xcfg.desktopManager.kde;
|
||||
xorg = xcfg.package;
|
||||
|
||||
options = { services = { xserver = { desktopManager = {
|
||||
|
||||
kde = {
|
||||
enable = mkOption {
|
||||
default = false;
|
||||
example = true;
|
||||
description = "Enable the kde desktop manager.";
|
||||
};
|
||||
};
|
||||
|
||||
}; }; }; };
|
||||
in
|
||||
|
||||
mkIf (xcfg.enable && cfg.enable) {
|
||||
require = [
|
||||
options
|
||||
|
||||
# environment.kdePackages
|
||||
./kde-environment.nix
|
||||
];
|
||||
|
||||
services = {
|
||||
xserver = {
|
||||
|
||||
desktopManager = {
|
||||
session = [{
|
||||
name = "kde";
|
||||
start = ''
|
||||
# A quick hack to make KDE screen locking work. It calls
|
||||
# kcheckpass, which needs to be setuid in order to read the
|
||||
# shadow password file. We have a setuid wrapper around
|
||||
# kcheckpass. However, startkde adds $kdebase/bin to the start
|
||||
# of $PATH if it's not already in $PATH, thus overriding the
|
||||
# setuid wrapper directory. So here we add $kdebase/bin to the
|
||||
# end of $PATH to keep startkde from doing that.
|
||||
export PATH=$PATH:${pkgs.kdebase}/bin
|
||||
|
||||
# Start KDE.
|
||||
exec ${pkgs.kdebase}/bin/startkde
|
||||
'';
|
||||
}];
|
||||
};
|
||||
|
||||
};
|
||||
};
|
||||
|
||||
security.setuidPrograms = [ "kcheckpass" ];
|
||||
|
||||
environment = {
|
||||
kdePackages = [
|
||||
pkgs.kdelibs
|
||||
pkgs.kdebase
|
||||
];
|
||||
|
||||
x11Packages = [
|
||||
xorg.xset # used by startkde, non-essential
|
||||
];
|
||||
|
||||
etc = [
|
||||
{ source = "${pkgs.xkeyboard_config}/etc/X11/xkb";
|
||||
target = "X11/xkb";
|
||||
}
|
||||
];
|
||||
};
|
||||
}
|
||||
|
|
@ -11,10 +11,6 @@ let
|
|||
in
|
||||
|
||||
{
|
||||
|
||||
imports = [ ./kde-environment.nix ];
|
||||
|
||||
|
||||
options = {
|
||||
|
||||
services.xserver.desktopManager.kde4.enable = mkOption {
|
||||
|
|
@ -23,6 +19,14 @@ in
|
|||
description = "Enable the KDE 4 desktop environment.";
|
||||
};
|
||||
|
||||
environment.kdePackages = mkOption {
|
||||
default = [];
|
||||
example = [ pkgs.kde4.digikam ];
|
||||
type = types.list types.package;
|
||||
description = "Additional KDE 4 programs. Only minimal set is installed by
|
||||
default.";
|
||||
};
|
||||
|
||||
};
|
||||
|
||||
|
||||
|
|
@ -46,28 +50,31 @@ in
|
|||
|
||||
security.setuidPrograms = [ "kcheckpass" ];
|
||||
|
||||
environment.kdePackages =
|
||||
[ pkgs.kde4.kdelibs
|
||||
environment = {
|
||||
kdePackages = [
|
||||
pkgs.kde4.kdelibs
|
||||
pkgs.kde4.kdebase
|
||||
pkgs.kde4.kdebase_runtime
|
||||
pkgs.kde4.kdebase_workspace
|
||||
pkgs.kde4.oxygen_icons
|
||||
pkgs.kde4.qt4 # needed for qdbus
|
||||
pkgs.shared_mime_info
|
||||
pkgs.gst_all.gstreamer
|
||||
pkgs.gst_all.gstPluginsBase
|
||||
pkgs.gst_all.gstPluginsGood
|
||||
] ++ optional (pkgs.kde4 ? oxygen_icons) pkgs.kde4.oxygen_icons;
|
||||
|
||||
environment.x11Packages =
|
||||
[ xorg.xmessage # so that startkde can show error messages
|
||||
pkgs.kde4.qt4 # needed for qdbus
|
||||
xorg.xmessage # so that startkde can show error messages
|
||||
xorg.xset # used by startkde, non-essential
|
||||
];
|
||||
|
||||
environment.etc = singleton
|
||||
x11Packages = config.environment.kdePackages;
|
||||
|
||||
pathsToLink = [ "/etc/xdg" "/etc/dbus-1" "/share" ];
|
||||
|
||||
etc = singleton
|
||||
{ source = "${pkgs.xkeyboard_config}/etc/X11/xkb";
|
||||
target = "X11/xkb";
|
||||
};
|
||||
|
||||
};
|
||||
};
|
||||
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue