diff --git a/installer/cd-dvd/live-dvd-X-no-soft.nix b/installer/cd-dvd/live-dvd-X-no-soft.nix index 2afe37aa5f88..7111107b6757 100644 --- a/installer/cd-dvd/live-dvd-X-no-soft.nix +++ b/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; diff --git a/system/options.nix b/system/options.nix index 40e169c7a908..d15c21645458 100644 --- a/system/options.nix +++ b/system/options.nix @@ -1557,6 +1557,16 @@ in "; }; + virtualScreen = mkOption { + default = null; + example = { + x=2048; + y=2048; + }; + description = " + Virtual screen size for Xrandr + "; + }; }; ejabberd = { diff --git a/upstart-jobs/xserver.conf b/upstart-jobs/xserver.conf index 98f98f481f9f..36e9da8bf0fe 100644 --- a/upstart-jobs/xserver.conf +++ b/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 diff --git a/upstart-jobs/xserver.nix b/upstart-jobs/xserver.nix index caf842a8e45e..7c82d63b8c63 100644 --- a/upstart-jobs/xserver.nix +++ b/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}"'';