From 1aa1c86afc5ac6e11162fb55f0113b7c58936c8a Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 22 Aug 2011 23:10:24 +0000
Subject: [PATCH] * Enable upower and udisks for Xfce 4.8.

svn path=/nixos/trunk/; revision=28764
---
 modules/services/x11/desktop-managers/kde4.nix | 4 ++--
 modules/services/x11/desktop-managers/xfce.nix | 3 +++
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/modules/services/x11/desktop-managers/kde4.nix b/modules/services/x11/desktop-managers/kde4.nix
index ce3966fb28a..6baa17be9a1 100644
--- a/modules/services/x11/desktop-managers/kde4.nix
+++ b/modules/services/x11/desktop-managers/kde4.nix
@@ -140,10 +140,10 @@ in
         target = "X11/xkb";
       };
 
-    # Enable required DBus services.
+    # Enable helpful DBus services.
     services.hal = mkIf (!isKDE47) { enable = true; };
     services.udisks = mkIf isKDE47 { enable = true; };
-    services.upower = mkIf isKDE47 { enable = true; };
+    services.upower = mkIf (isKDE47 && config.powerManagement.enable) { enable = true; };
 
   };
 
diff --git a/modules/services/x11/desktop-managers/xfce.nix b/modules/services/x11/desktop-managers/xfce.nix
index 89d4b1fd4dd..fa1e4044b14 100644
--- a/modules/services/x11/desktop-managers/xfce.nix
+++ b/modules/services/x11/desktop-managers/xfce.nix
@@ -80,7 +80,10 @@ in
     environment.pathsToLink =
       [ "/share/xfce4" "/share/themes" "/share/mime" "/share/desktop-directories" ];
       
+    # Enable helpful DBus services.
     services.hal = mkIf (!isXfce48) { enable = true; };
+    services.udisks = mkIf isXfce48 { enable = true; };
+    services.upower = mkIf (isXfce48 && config.powerManagement.enable) { enable = true; };
     
   };