diff --git a/upstart-jobs/default.nix b/upstart-jobs/default.nix
index 3f66f7e137e7..2baedf3ccbbf 100644
--- a/upstart-jobs/default.nix
+++ b/upstart-jobs/default.nix
@@ -158,13 +158,14 @@ import ../upstart-jobs/gather.nix {
   ++ optional ["services" "xserver" "enable"]
     (import ../upstart-jobs/xserver.nix {
       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
         openssh x11_ssh_askpass nvidiaDrivers synaptics;
+      stdenv = pkgs.stdenvNewSetupScript;
       libX11 = pkgs.xlibs.libX11;
       libXext = pkgs.xlibs.libXext;
       fontDirectories = import ../system/fonts.nix {inherit pkgs config;};
-	isClone = config.get ["services" "xserver" "isClone"];
+      isClone = config.get ["services" "xserver" "isClone"];
     })
 
   # Apache httpd.
diff --git a/upstart-jobs/xserver.nix b/upstart-jobs/xserver.nix
index c55f19cc5dcd..87df40ef206e 100644
--- a/upstart-jobs/xserver.nix
+++ b/upstart-jobs/xserver.nix
@@ -133,21 +133,33 @@ let
 
       #if only my gf were this dirty
       if test \"${toString videoDriver}\" == \"nvidia\"; then
-        export moduleSection=\"Load  \\\"glx\\\" \\
- SubSection \\\"extmod\\\" \\n \\
- Option \\\"omit xfree86-dga\\\" \\n \\
- EndSubSection \\n \"
+        export moduleSection='
+          Load \"glx\"
+          SubSection \"extmod\"
+            Option \"omit xfree86-dga\"
+          EndSubSection
+        '
 
-        export screen=\"Option  \\\"AddARGBGLXVisuals\\\" \\\"true\\\" \\n \\
- Option  \\\"DisableGLXRootClipping\\\" \\\"true\\\" \\n \"
-        export device=\"Option       \\\"RenderAccel\\\" \\\"true\\\" \\n \\
- Option       \\\"AllowGLXWithComposite\\\" \\\"true\\\" \\n \\
- Option       \\\"AddARGBGLXVisuals\\\"     \\\"true\\\" \\n \"
-        export extensions=\"Option       \\\"Composite\\\" \\\"Enable\\\" \\n \"
+        export screen='
+          Option \"AddARGBGLXVisuals\" \"true\"
+          Option \"DisableGLXRootClipping\" \"true\"
+        '
+        
+        export device='
+          Option \"RenderAccel\" \"true\"
+          Option \"AllowGLXWithComposite\" \"true\"
+          Option \"AddARGBGLXVisuals\" \"true\"
+        '
+        
+        export extensions='
+          Option \"Composite\" \"Enable\"
+        '
 
       else
-        export moduleSection='Load \"glx\" 
-          Load \"dri\" '
+        export moduleSection='
+          Load \"glx\"
+          Load \"dri\"
+        '
         export screen=
         export device=
         export extensions=