mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-01-11 07:23:40 +00:00
Added keyboard layout to options and internal AGPGART option
svn path=/nixos/trunk/; revision=9369
This commit is contained in:
parent
2cf1edf365
commit
07fd13f20e
@ -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"];
|
||||
|
@ -79,6 +79,7 @@ Section "Device"
|
||||
#Option "MonitorLayout" "CRT,LFP"
|
||||
Option "MonitorLayout" "LVDS,CRT"
|
||||
@device@
|
||||
@internalAGPGART@
|
||||
EndSection
|
||||
|
||||
|
||||
|
@ -105,6 +105,12 @@ let
|
||||
|
||||
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= # urgh, don't substitute this
|
||||
|
Loading…
Reference in New Issue
Block a user