From 600d43ba9326cee88cd2b3fedcb62cee4dd06a51 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 21 Sep 2012 11:03:07 -0400
Subject: [PATCH] Drop xfce-4.6 compatibility

---
 modules/services/x11/desktop-managers/xfce.nix | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

diff --git a/modules/services/x11/desktop-managers/xfce.nix b/modules/services/x11/desktop-managers/xfce.nix
index 753bac476274..d06eb23b8e97 100644
--- a/modules/services/x11/desktop-managers/xfce.nix
+++ b/modules/services/x11/desktop-managers/xfce.nix
@@ -7,8 +7,6 @@ let
   xcfg = config.services.xserver;
   cfg = xcfg.desktopManager.xfce;
 
-  isXfce48 = pkgs.xfce ? libxfce4ui;
-
 in
 
 {
@@ -45,8 +43,7 @@ in
       };
 
     environment.systemPackages =
-      [
-        pkgs.gtk # To get GTK+'s themes.
+      [ pkgs.gtk # To get GTK+'s themes.
         pkgs.hicolor_icon_theme
         pkgs.shared_mime_info
         pkgs.which # Needed by the xfce's xinitrc script.
@@ -70,8 +67,6 @@ in
         # "utilities-terminal" and "accessories-text-editor".
         pkgs.gnome.gnomeicontheme
         pkgs.desktop_file_utils
-      ]
-      ++ optionals isXfce48 [
         pkgs.xfce.libxfce4ui
         pkgs.xfce.garcon
         pkgs.xfce.thunar_volman
@@ -83,15 +78,14 @@ in
     environment.pathsToLink =
       [ "/share/xfce4" "/share/themes" "/share/mime" "/share/desktop-directories" ];
 
-    environment.shellInit = optionalString isXfce48
+    environment.shellInit =
       ''
         export GIO_EXTRA_MODULES=${pkgs.xfce.gvfs}/lib/gio/modules
       '';
 
     # 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; };
+    services.udisks.enable = true;
+    services.upower.enable = config.powerManagement.enable;
 
   };