alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Pull requests Activity

* Manual bug.

Browse source 
svn path=/nixos/trunk/; revision=10179
This commit is contained in:
Eelco Dolstra 2008-01-16 15:33:09 +00:00
parent 622734b58b
commit d9ffa7f72e
2 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
system/options.nix
View file

@ -825,7 +825,7 @@
description = " description = "
The command executed after login and after the window manager The command executed after login and after the window manager
has been started. Used if has been started. Used if
<option>services.xserver.sessionType</option> is not empty. <option>services.xserver.sessionType</option> is empty.
"; ";
}; };

8
upstart-jobs/xserver.nix
View file

@ -18,15 +18,13 @@ let
videoDriver = cfg.videoDriver; videoDriver = cfg.videoDriver;
resolutions = map (res: ''"${toString res.x}x${toString res.y}"'') (cfg.resolutions); resolutions = map (res: ''"${toString res.x}x${toString res.y}"'') (cfg.resolutions);
sessionType = cfg.sessionType; sessionType = cfg.sessionType;
sessionStarter = cfg.sessionStarter;
renderingFlag = cfg.renderingFlag;
sessionCmd = sessionCmd =
if sessionType == "" then sessionStarter else if sessionType == "" then cfg.sessionStarter else
if sessionType == "xterm" then "${pkgs.xterm}/bin/xterm -ls" else if sessionType == "xterm" then "${pkgs.xterm}/bin/xterm -ls" else
if sessionType == "gnome" then "${gnome.gnometerminal}/bin/gnome-terminal -ls" else if sessionType == "gnome" then "${gnome.gnometerminal}/bin/gnome-terminal -ls" else
abort ("unknown session type "+ sessionType); abort ("unknown session type ${sessionType}");
windowManager = windowManager =
@ -221,7 +219,7 @@ let
# Start Compiz and the GTK-style window decorator. # Start Compiz and the GTK-style window decorator.
env LD_LIBRARY_PATH=${xorg.libX11}/lib:${xorg.libXext}/lib:/usr/lib/ env LD_LIBRARY_PATH=${xorg.libX11}/lib:${xorg.libXext}/lib:/usr/lib/
${pkgs.compiz}/bin/compiz gconf ${renderingFlag} & ${pkgs.compiz}/bin/compiz gconf ${cfg.renderingFlag} &
${pkgs.compiz}/bin/gtk-window-decorator --sync & ${pkgs.compiz}/bin/gtk-window-decorator --sync &
'' ''