From 3b1c741f3fef52ba245591f42971d8abf656cb39 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 22 Aug 2011 22:52:13 +0000
Subject: [PATCH] * Xfce 4.8 doesn't need HAL anymore.

svn path=/nixos/trunk/; revision=28762
---
 modules/services/x11/desktop-managers/xfce.nix | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/modules/services/x11/desktop-managers/xfce.nix b/modules/services/x11/desktop-managers/xfce.nix
index a9a0cd27e1a..89d4b1fd4dd 100644
--- a/modules/services/x11/desktop-managers/xfce.nix
+++ b/modules/services/x11/desktop-managers/xfce.nix
@@ -7,6 +7,8 @@ let
   xcfg = config.services.xserver;
   cfg = xcfg.desktopManager.xfce;
 
+  isXfce48 = pkgs.xfce ? libxfce4ui;
+
 in
 
 {
@@ -69,12 +71,16 @@ in
         pkgs.gnome.gnomeicontheme
         pkgs.desktop_file_utils
       ]
+      ++ optionals isXfce48 [
+        pkgs.xfce.libxfce4ui
+        pkgs.xfce.garcon
+      ]
       ++ optional config.powerManagement.enable pkgs.xfce.xfce4_power_manager;
 
     environment.pathsToLink =
-      [ "/share/xfce4" "/share/themes" "/share/mime" ];
+      [ "/share/xfce4" "/share/themes" "/share/mime" "/share/desktop-directories" ];
       
-    services.hal.enable = true;
+    services.hal = mkIf (!isXfce48) { enable = true; };
     
   };