kde4: use udisks2 for kde versions that support it.

Currently, none do, although kde 4.10 is supposed to be able to use it.
This commit is contained in:
Mathijs Kwik 2013-05-15 00:47:57 +02:00
parent 4630ad4d26
commit 0e9a963b42

View File

@ -42,6 +42,8 @@ let
phononBackendPackages = flip concatMap cfg.phononBackends phononBackendPackages = flip concatMap cfg.phononBackends
(name: attrByPath [name] (throw "unknown phonon backend `${name}'") phononBackends); (name: attrByPath [name] (throw "unknown phonon backend `${name}'") phononBackends);
wantsUdisks2 = pkgs.kde4.kdelibs.wantsUdisks2 or false;
in in
{ {
@ -155,7 +157,8 @@ in
}; };
# Enable helpful DBus services. # Enable helpful DBus services.
services.udisks.enable = true; services.udisks.enable = ! wantsUdisks2;
services.udisks2.enable = wantsUdisks2;
services.upower.enable = config.powerManagement.enable; services.upower.enable = config.powerManagement.enable;
security.pam.services = [ { name = "kde"; allowNullPassword = true; startSession = true; } ]; security.pam.services = [ { name = "kde"; allowNullPassword = true; startSession = true; } ];