From f6497fa576dd21e2e986322f8e63bf6ff8f855ec Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 9 Aug 2010 11:51:44 +0000
Subject: [PATCH] * Use the proper Xfce session start script.  Include the
 desktop and   the panel.

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

diff --git a/modules/services/x11/desktop-managers/xfce.nix b/modules/services/x11/desktop-managers/xfce.nix
index 7403138b70c..10457a2eeb6 100644
--- a/modules/services/x11/desktop-managers/xfce.nix
+++ b/modules/services/x11/desktop-managers/xfce.nix
@@ -28,14 +28,21 @@ in
         bgSupport = true;
         start =
           ''
-            ${pkgs.xfce.xfwm4}/bin/xfwm4 --daemon
-            exec ${pkgs.xfce.terminal}/bin/terminal
+            exec ${pkgs.stdenv.shell} ${pkgs.xfce.xfceutils}/etc/xdg/xfce4/xinitrc
           '';
       };
 
     environment.systemPackages =
-      [ pkgs.xfce.xfwm4
+      [
+        pkgs.which # Needed by the xfce's xinitrc script.
+        pkgs.xfce.exo
         pkgs.xfce.terminal
+        pkgs.xfce.xfce4panel
+        pkgs.xfce.xfce4session
+        pkgs.xfce.xfceutils
+        pkgs.xfce.xfconf
+        pkgs.xfce.xfdesktop
+        pkgs.xfce.xfwm4
       ];
 
   };