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

Fix mkThenElse and mkAlways evaluation.

Browse Source 
svn path=/nixpkgs/trunk/; revision=14528
This commit is contained in:
Nicolas Pierron 2009-03-14 07:20:31 +00:00
parent de8bbafb53
commit f624a70ee7
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/lib/options.nix
View File

@ -482,12 +482,12 @@ rec {
# evaluate the condition. # evaluate the condition.
if isThenElse p then if isThenElse p then
if condition then if condition then
foldProperty (a: p.thenPart) id content copyProperties content p.thenPart
else else
foldProperty (a: p.elsePart) id content copyProperties content p.elsePart
# ignore the condition. # ignore the condition.
else if isAlways p then else if isAlways p then
foldProperty (a: p.value) id content copyProperties content p.value
# otherwise (isIf) # otherwise (isIf)
else else
evalIf content (condition && p.condition) (tail list); evalIf content (condition && p.condition) (tail list);