Author: eelco
Date: Mon Aug 9 11:51:44 2010
New Revision: 23055
URL: https://svn.nixos.org/websvn/nix/?rev=23055&sc=1
Log:
* Use the proper Xfce session start script. Include the desktop and
the panel.
Modified:
nixos/trunk/modules/services/x11/desktop-managers/xfce.nix
Modified: nixos/trunk/modules/services/x11/desktop-managers/xfce.nix
==============================================================================
--- nixos/trunk/modules/services/x11/desktop-managers/xfce.nix Mon Aug 9
11:42:55 2010 (r23054)
+++ nixos/trunk/modules/services/x11/desktop-managers/xfce.nix Mon Aug 9
11:51:44 2010 (r23055)
@@ -28,14 +28,21 @@
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
];
};
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
