diff options
| author | Nicolas Pierron <nicolas.b.pierron@gmail.com> | 2009-03-14 07:20:31 +0000 |
|---|---|---|
| committer | Nicolas Pierron <nicolas.b.pierron@gmail.com> | 2009-03-14 07:20:31 +0000 |
| commit | f624a70ee7ab0929b6c408835ef4989848046272 (patch) | |
| tree | 51aa21e64c61df2c018d62fd8bbca2ab6c47a0d6 | |
| parent | de8bbafb53845d7b216dc936f15cdcf2436f7d33 (diff) | |
| download | nixlib-f624a70ee7ab0929b6c408835ef4989848046272.tar nixlib-f624a70ee7ab0929b6c408835ef4989848046272.tar.gz nixlib-f624a70ee7ab0929b6c408835ef4989848046272.tar.bz2 nixlib-f624a70ee7ab0929b6c408835ef4989848046272.tar.lz nixlib-f624a70ee7ab0929b6c408835ef4989848046272.tar.xz nixlib-f624a70ee7ab0929b6c408835ef4989848046272.tar.zst nixlib-f624a70ee7ab0929b6c408835ef4989848046272.zip | |
Fix mkThenElse and mkAlways evaluation.
svn path=/nixpkgs/trunk/; revision=14528
| -rw-r--r-- | pkgs/lib/options.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/lib/options.nix b/pkgs/lib/options.nix index cde0b6df34cc..6a4d6b4b695e 100644 --- a/pkgs/lib/options.nix +++ b/pkgs/lib/options.nix @@ -482,12 +482,12 @@ rec { # evaluate the condition. if isThenElse p then if condition then - foldProperty (a: p.thenPart) id content + copyProperties content p.thenPart else - foldProperty (a: p.elsePart) id content + copyProperties content p.elsePart # ignore the condition. else if isAlways p then - foldProperty (a: p.value) id content + copyProperties content p.value # otherwise (isIf) else evalIf content (condition && p.condition) (tail list); |