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

do not delay mkOverride on options which are does not have sub modules. 

svn path=/nixpkgs/trunk/; revision=17758
This commit is contained in:
Nicolas Pierron 2009-10-12 15:07:31 +00:00
parent 7e3bcbd4c2
commit e82843144c
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/lib/modules.nix
View File

@ -118,7 +118,7 @@ rec {
moduleApply { config = delayProperties; } module; moduleApply { config = delayProperties; } module;
evalDefinitions = opt: values: evalDefinitions = opt: values:
if opt ? type && opt.type.delayOnGlobalEval then if opt ? options && opt.options != [] && opt ? type && opt.type.delayOnGlobalEval then
map (delayPropertiesWithIter opt.type.iter opt.name) map (delayPropertiesWithIter opt.type.iter opt.name)
(evalLocalProperties values) (evalLocalProperties values)
else else