From 598848d6afbf487055890cc257d73fcc306f7e46 Mon Sep 17 00:00:00 2001 From: Marc Weber Date: Wed, 2 Jan 2008 21:16:58 +0000 Subject: [PATCH] patches provided by Tobias Hammerschmidt svn path=/nixos/trunk/; revision=10055 --- system/options.nix | 8 ++++++++ upstart-jobs/xserver.conf | 3 +++ upstart-jobs/xserver.nix | 1 + 3 files changed, 12 insertions(+) diff --git a/system/options.nix b/system/options.nix index 7ae100632b8..0a24134a30e 100644 --- a/system/options.nix +++ b/system/options.nix @@ -855,6 +855,14 @@ "; }; + extraDisplaySettings = mkOption { + default = ""; + example = "Virtual 2048 2048"; + description = " + Just anything to add into Display subsection (located in Screen section). + "; + }; + extraModules = mkOption { default = ""; example = " diff --git a/upstart-jobs/xserver.conf b/upstart-jobs/xserver.conf index 14fe98b13a0..e3c29cec375 100644 --- a/upstart-jobs/xserver.conf +++ b/upstart-jobs/xserver.conf @@ -62,14 +62,17 @@ Section "Screen" SubSection "Display" Depth 16 Modes @resolutions@ + @extraDisplaySettings@ EndSubSection SubSection "Display" Depth 24 Modes @resolutions@ + @extraDisplaySettings@ EndSubSection #SubSection "Display" # Depth 32 # Modes @resolutions@ + # @extraDisplaySettings@ #EndSubSection @screen@ diff --git a/upstart-jobs/xserver.nix b/upstart-jobs/xserver.nix index 989460a46c6..bdc758f1a45 100644 --- a/upstart-jobs/xserver.nix +++ b/upstart-jobs/xserver.nix @@ -118,6 +118,7 @@ let extraDeviceConfig = cfg.extraDeviceConfig; extraMonitorSettings = cfg.extraMonitorSettings; + extraDisplaySettings = cfg.extraDisplaySettings; extraModules = cfg.extraModules; serverLayoutOptions = cfg.serverLayoutOptions; defaultDepth = cfg.defaultDepth;