diff options
author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2010-08-09 11:51:44 +0000 |
---|---|---|
committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2010-08-09 11:51:44 +0000 |
commit | f6497fa576dd21e2e986322f8e63bf6ff8f855ec (patch) | |
tree | 788271da6379a4fc109cd0ac7657c99c056f6798 /modules | |
parent | fc8204c0e45cc9d748b1650f23f41d7230acdad0 (diff) | |
download | nixlib-f6497fa576dd21e2e986322f8e63bf6ff8f855ec.tar nixlib-f6497fa576dd21e2e986322f8e63bf6ff8f855ec.tar.gz nixlib-f6497fa576dd21e2e986322f8e63bf6ff8f855ec.tar.bz2 nixlib-f6497fa576dd21e2e986322f8e63bf6ff8f855ec.tar.lz nixlib-f6497fa576dd21e2e986322f8e63bf6ff8f855ec.tar.xz nixlib-f6497fa576dd21e2e986322f8e63bf6ff8f855ec.tar.zst nixlib-f6497fa576dd21e2e986322f8e63bf6ff8f855ec.zip |
* Use the proper Xfce session start script. Include the desktop and
the panel. svn path=/nixos/trunk/; revision=23055
Diffstat (limited to 'modules')
-rw-r--r-- | modules/services/x11/desktop-managers/xfce.nix | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/modules/services/x11/desktop-managers/xfce.nix b/modules/services/x11/desktop-managers/xfce.nix index 7403138b70cc..10457a2eeb65 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 ]; }; |