An option for XRandr support. Use it for dualhead ATi (and probably Intel) cards.

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

installer/cd-dvd/live-dvd-X-no-soft.nix

@@ -18,11 +18,12 @@ let
 	windowManager = "twm";
 	tty = "9";
   };
+  pkgs
 
 in 
 (isoFun {
 	inherit platform;
-	lib = (import ../pkgs/lib);
+	lib = (import ../../pkgs/lib);
 
 	networkNixpkgs = "";
 	manualEnabled = true;

system/options.nix

@@ -1557,6 +1557,16 @@ in
         ";
       };
 
+      virtualScreen = mkOption {
+        default = null;
+	example = {
+	  x=2048;
+	  y=2048;
+	};
+	description = "
+	  Virtual screen size for Xrandr
+	";
+      };
     };
 
     ejabberd = {

upstart-jobs/xserver.conf

@@ -58,11 +58,13 @@ Section "Screen"
     Depth      16
     Modes      @resolutions@
     @extraDisplaySettings@
+    @virtualScreen@
   EndSubSection
   SubSection "Display"
     Depth      24
     Modes      @resolutions@
     @extraDisplaySettings@
+    @virtualScreen@
   EndSubSection
   #SubSection "Display"
   #  Depth      32

upstart-jobs/xserver.nix

@@ -125,6 +125,9 @@ let
     extraModules = cfg.extraModules; 
     serverLayoutOptions = cfg.serverLayoutOptions; 
     defaultDepth = cfg.defaultDepth; 
+    virtualScreen = if cfg.virtualScreen != null then 
+        "Virtual ${toString cfg.virtualScreen.x} ${toString cfg.virtualScreen.y}" 
+      else "";
 
     xfs = if cfg.useXFS == false then "" else 
       ''FontPath "${toString cfg.useXFS}"'';