From 0e9a963b424257e3a578c1054ab5895ae8b38a19 Mon Sep 17 00:00:00 2001
From: Mathijs Kwik <mathijs@bluescreen303.nl>
Date: Wed, 15 May 2013 00:47:57 +0200
Subject: [PATCH] kde4: use udisks2 for kde versions that support it.

Currently, none do, although kde 4.10 is supposed to be able to use it.
---
 modules/services/x11/desktop-managers/kde4.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

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