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

* Use the stdenv that does support \n in replacements.

Browse Source 
svn path=/nixos/trunk/; revision=9399
This commit is contained in:
Eelco Dolstra 2007-10-03 14:48:41 +00:00
parent f402fd73f2
commit 48acdef3c9
2 changed files with 27 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
upstart-jobs/default.nix
View File

@ -158,13 +158,14 @@ import ../upstart-jobs/gather.nix {
++ optional ["services" "xserver" "enable"] ++ optional ["services" "xserver" "enable"]
(import ../upstart-jobs/xserver.nix { (import ../upstart-jobs/xserver.nix {
inherit config; inherit config;
inherit (pkgs) stdenv writeText lib xterm slim xorg mesa inherit (pkgs) writeText lib xterm slim xorg mesa
gnome compiz feh kdebase kdelibs xkeyboard_config gnome compiz feh kdebase kdelibs xkeyboard_config
openssh x11_ssh_askpass nvidiaDrivers synaptics; openssh x11_ssh_askpass nvidiaDrivers synaptics;
stdenv = pkgs.stdenvNewSetupScript;
libX11 = pkgs.xlibs.libX11; libX11 = pkgs.xlibs.libX11;
libXext = pkgs.xlibs.libXext; libXext = pkgs.xlibs.libXext;
fontDirectories = import ../system/fonts.nix {inherit pkgs config;}; fontDirectories = import ../system/fonts.nix {inherit pkgs config;};
isClone = config.get ["services" "xserver" "isClone"]; isClone = config.get ["services" "xserver" "isClone"];
}) })
# Apache httpd. # Apache httpd.

36
upstart-jobs/xserver.nix
View File

@ -133,21 +133,33 @@ let
#if only my gf were this dirty #if only my gf were this dirty
if test \"${toString videoDriver}\" == \"nvidia\"; then if test \"${toString videoDriver}\" == \"nvidia\"; then
export moduleSection=\"Load \\\"glx\\\" \\ export moduleSection='
SubSection \\\"extmod\\\" \\n \\ Load \"glx\"
Option \\\"omit xfree86-dga\\\" \\n \\ SubSection \"extmod\"
EndSubSection \\n \" Option \"omit xfree86-dga\"
EndSubSection
'
export screen=\"Option \\\"AddARGBGLXVisuals\\\" \\\"true\\\" \\n \\ export screen='
Option \\\"DisableGLXRootClipping\\\" \\\"true\\\" \\n \" Option \"AddARGBGLXVisuals\" \"true\"
export device=\"Option \\\"RenderAccel\\\" \\\"true\\\" \\n \\ Option \"DisableGLXRootClipping\" \"true\"
Option \\\"AllowGLXWithComposite\\\" \\\"true\\\" \\n \\ '
Option \\\"AddARGBGLXVisuals\\\" \\\"true\\\" \\n \"
export extensions=\"Option \\\"Composite\\\" \\\"Enable\\\" \\n \" export device='
Option \"RenderAccel\" \"true\"
Option \"AllowGLXWithComposite\" \"true\"
Option \"AddARGBGLXVisuals\" \"true\"
'
export extensions='
Option \"Composite\" \"Enable\"
'
else else
export moduleSection='Load \"glx\" export moduleSection='
Load \"dri\" ' Load \"glx\"
Load \"dri\"
'
export screen= export screen=
export device= export device=
export extensions= export extensions=