public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

svn path=/nixos/trunk/; revision=9665

Browse Source
This commit is contained in:
Wouter den Breejen 2007-11-13 16:38:39 +00:00
parent de01f56b42
commit 14c2bb437d
1 changed files with 1 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
upstart-jobs/xserver.nix
View File

@ -27,11 +27,6 @@ let
optional = condition: x: if condition then [x] else []; optional = condition: x: if condition then [x] else [];
#Beryl parameters
#berylcore
#berylmanager
#berylemerald
# Get a bunch of user settings. # Get a bunch of user settings.
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);
@ -242,10 +237,6 @@ let
${compiz}/bin/compiz gconf ${renderingFlag}& ${compiz}/bin/compiz gconf ${renderingFlag}&
${compiz}/bin/gtk-window-decorator --sync & ${compiz}/bin/gtk-window-decorator --sync &
" "
#else if windowManager == "beryl" then "
# ${berylmanager}/bin/beryl-manager &
#"
else if windowManager == "none" then " else if windowManager == "none" then "
# The session starter will start the window manager. # The session starter will start the window manager.
@ -348,9 +339,6 @@ rec {
++ optional (windowManager == "compiz") [ ++ optional (windowManager == "compiz") [
compiz compiz
] ]
#++ optional (windowManager == "beryl") [
# berylcore berylmanager berylemerald
#]
++ optional (sessionType == "xterm") [ ++ optional (sessionType == "xterm") [
xterm xterm
] ]
@ -399,7 +387,7 @@ rec {
${if videoDriver == "nvidia" ${if videoDriver == "nvidia"
then "env XORG_DRI_DRIVER_PATH=${nvidiaDrivers}/X11R6/lib/modules/drivers/" then "env XORG_DRI_DRIVER_PATH=${nvidiaDrivers}/X11R6/lib/modules/drivers/"
else if cfg.driSupport else if cfg.driSupport
then "env XORG_DRI_DRIVER_PATH=${mesa}/lib/modules/dri" then "env XORG_DRI_DRIVER_PATH=${mesa}/lib/modules/dri"
else "" else ""
} }