From 94393dbd20f3c18381e18d8fb70c9fcde7693ea3 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 27 Feb 2007 00:50:22 +0000 Subject: [PATCH] * Create /var/state/opengl-driver. svn path=/nixos/trunk/; revision=8069 --- upstart-jobs/xserver.nix | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/upstart-jobs/xserver.nix b/upstart-jobs/xserver.nix index 6d13dd69deb..d5270c0273d 100644 --- a/upstart-jobs/xserver.nix +++ b/upstart-jobs/xserver.nix @@ -93,20 +93,23 @@ rec { name = "xserver"; job = " -#start on network-interfaces + #start on network-interfaces -start script + start script + rm -f /var/state/opengl-driver + ${if getCfg "driSupport" + then "ln -sf ${mesa} /var/state/opengl-driver" + else ""} + end script -end script + env SLIM_CFGFILE=${slimConfig} + env FONTCONFIG_FILE=/etc/fonts/fonts.conf # !!! cleanup -env SLIM_CFGFILE=${slimConfig} -env FONTCONFIG_FILE=/etc/fonts/fonts.conf # !!! cleanup + ${if getCfg "driSupport" + then "env XORG_DRI_DRIVER_PATH=${mesa}/lib/modules/dri" + else ""} -${if getCfg "driSupport" -then "env XORG_DRI_DRIVER_PATH=${mesa}/lib/modules/dri" -else ""} - -exec ${slim}/bin/slim + exec ${slim}/bin/slim "; }