diff options
| author | Nicolas Pierron <nicolas.b.pierron@gmail.com> | 2009-10-12 15:16:22 +0000 |
|---|---|---|
| committer | Nicolas Pierron <nicolas.b.pierron@gmail.com> | 2009-10-12 15:16:22 +0000 |
| commit | 19648abc05e559c39b49fc6fa2a76970aa457b65 (patch) | |
| tree | 735416c1fde9d46db8539abe2ef7ad286d5103a6 /pkgs/lib/modules.nix | |
| parent | e82843144cfa9a1b3767f15f2b0493464afa597d (diff) | |
| download | nixpkgs-19648abc05e559c39b49fc6fa2a76970aa457b65.tar nixpkgs-19648abc05e559c39b49fc6fa2a76970aa457b65.tar.gz nixpkgs-19648abc05e559c39b49fc6fa2a76970aa457b65.tar.bz2 nixpkgs-19648abc05e559c39b49fc6fa2a76970aa457b65.tar.lz nixpkgs-19648abc05e559c39b49fc6fa2a76970aa457b65.tar.xz nixpkgs-19648abc05e559c39b49fc6fa2a76970aa457b65.tar.zst nixpkgs-19648abc05e559c39b49fc6fa2a76970aa457b65.zip | |
Revert previous commit because this is implicit. Fix property evaluation
error which arose when one module define a value with "mkDefaultValue" and another module define its value with "mkIf <false>". svn path=/nixpkgs/trunk/; revision=17759
Diffstat (limited to 'pkgs/lib/modules.nix')
| -rw-r--r-- | pkgs/lib/modules.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/lib/modules.nix b/pkgs/lib/modules.nix index 55e33c22614..becd786d8cd 100644 --- a/pkgs/lib/modules.nix +++ b/pkgs/lib/modules.nix @@ -118,7 +118,7 @@ rec { moduleApply { config = delayProperties; } module; evalDefinitions = opt: values: - if opt ? options && opt.options != [] && opt ? type && opt.type.delayOnGlobalEval then + if opt ? type && opt.type.delayOnGlobalEval then map (delayPropertiesWithIter opt.type.iter opt.name) (evalLocalProperties values) else |