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

Added keyboard layout to options and internal AGPGART option

Browse Source 
svn path=/nixos/trunk/; revision=9369
This commit is contained in:
Michael Raskin 2007-09-24 19:32:21 +00:00
parent 2cf1edf365
commit 07fd13f20e
3 changed files with 24 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
system/options.nix
View File

@ -720,6 +720,23 @@
"; ";
} }
{
name = ["services" "xserver" "layout"];
default = "us";
description ="
Keyboard layout.
";
}
{
name = ["services" "xserver" "useInternalAGPGART"];
default = "";
example = "no";
description ="
Just the wrapper for an xorg.conf option.
";
}
{ {
name = ["services" "httpd" "enable"]; name = ["services" "httpd" "enable"];

1
upstart-jobs/xserver.conf
View File

@ -79,6 +79,7 @@ Section "Device"
#Option "MonitorLayout" "CRT,LFP" #Option "MonitorLayout" "CRT,LFP"
Option "MonitorLayout" "LVDS,CRT" Option "MonitorLayout" "LVDS,CRT"
@device@ @device@
@internalAGPGART@
EndSection EndSection

6
upstart-jobs/xserver.nix
View File

@ -105,6 +105,12 @@ let
corePointer = (if getCfg "isSynaptics" then "Touchpad[0]" else "Mouse[0]"); corePointer = (if getCfg "isSynaptics" then "Touchpad[0]" else "Mouse[0]");
internalAGPGART = (if (getCfg "useInternalAGPGART") == "yes" then
" Option \"UseInternalAGPGART\" \"yes\"" else
if (getCfg "useInternalAGPGART") == "no" then
" Option \"UseInternalAGPGART\" \"no\"" else
" ");
buildCommand = " buildCommand = "
buildCommand= # urgh, don't substitute this buildCommand= # urgh, don't substitute this