* Don't enable HAL by default anymore. It's obsolete. It's still
enabled by modules that need it (KDE < 4.7, Xfce). * Don't enable the PolicyKit module by default either, it's also obsolete (replaced by PolKit). It's still enabled if HAL is enabled. svn path=/nixos/trunk/; revision=27933
This commit is contained in:
parent
38fddb2243
commit
a1df35a590
|
@ -19,7 +19,17 @@ in
|
|||
|
||||
{
|
||||
|
||||
config = {
|
||||
options = {
|
||||
|
||||
security.policykit.enable = mkOption {
|
||||
default = false;
|
||||
description = "Enable PolicyKit (obsolete).";
|
||||
};
|
||||
|
||||
};
|
||||
|
||||
|
||||
config = mkIf config.security.policykit.enable {
|
||||
|
||||
environment.systemPackages = [ pkgs.policykit ];
|
||||
|
||||
|
|
|
@ -26,7 +26,7 @@ in
|
|||
services.hal = {
|
||||
|
||||
enable = mkOption {
|
||||
default = true;
|
||||
default = false;
|
||||
description = ''
|
||||
Whether to start the HAL daemon.
|
||||
'';
|
||||
|
@ -52,6 +52,8 @@ in
|
|||
|
||||
services.hal.packages = [ hal pkgs.hal_info ];
|
||||
|
||||
security.policykit.enable = true;
|
||||
|
||||
users.extraUsers = singleton
|
||||
{ name = "haldaemon";
|
||||
uid = config.ids.uids.haldaemon;
|
||||
|
|
|
@ -8,6 +8,8 @@ let
|
|||
cfg = xcfg.desktopManager.kde4;
|
||||
xorg = pkgs.xorg;
|
||||
|
||||
isKDE47 = !(pkgs.kde4 ? kdebase);
|
||||
|
||||
in
|
||||
|
||||
{
|
||||
|
@ -77,7 +79,7 @@ in
|
|||
};
|
||||
|
||||
environment.systemPackages =
|
||||
(if pkgs.kde4 ? kdebase then
|
||||
(if !isKDE47 then
|
||||
# KDE <= 4.6
|
||||
[ # temporary workarounds
|
||||
pkgs.shared_desktop_ontologies
|
||||
|
@ -132,6 +134,11 @@ in
|
|||
target = "X11/xkb";
|
||||
};
|
||||
|
||||
# Enable required DBus services.
|
||||
services.hal = mkIf (!isKDE47) { enable = true; };
|
||||
services.udisks = mkIf isKDE47 { enable = true; };
|
||||
services.upower = mkIf isKDE47 { enable = true; };
|
||||
|
||||
};
|
||||
|
||||
}
|
||||
|
|
|
@ -74,6 +74,8 @@ in
|
|||
environment.pathsToLink =
|
||||
[ "/share/xfce4" "/share/themes" "/share/mime" ];
|
||||
|
||||
services.hal.enable = true;
|
||||
|
||||
};
|
||||
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue