mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-10-21 04:42:07 +03:00
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:
parent
4630ad4d26
commit
0e9a963b42
@ -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; } ];
|
||||||
|
Loading…
Reference in New Issue
Block a user