forked from mirrors/nixpkgs
* Print a sensible error message if there are multiple declarations
for an option. * Removed double declaration for services.xserver.layout. svn path=/nixos/trunk/; revision=9398
This commit is contained in:
parent
33aa5d2d74
commit
f402fd73f2
|
@ -20,6 +20,7 @@ rec {
|
|||
decl =
|
||||
lib.findSingle (decl: lib.eqLists decl.name name)
|
||||
(abort ("Undeclared option `" + printName name + "'."))
|
||||
(abort ("Multiple declarations for option `" + printName name + "'."))
|
||||
declarations;
|
||||
default =
|
||||
if !decl ? default
|
||||
|
|
|
@ -720,14 +720,6 @@
|
|||
";
|
||||
}
|
||||
|
||||
{
|
||||
name = ["services" "xserver" "layout"];
|
||||
default = "us";
|
||||
description ="
|
||||
Keyboard layout.
|
||||
";
|
||||
}
|
||||
|
||||
{
|
||||
name = ["services" "xserver" "useInternalAGPGART"];
|
||||
default = "";
|
||||
|
|
Loading…
Reference in a new issue