rename.nix: Handle renaming of a whole set of options

mkIf was pushed down, making the obsoleted argument unconditionally evaluated

Signed-off-by: Shea Levy <shea@shealevy.com>
This commit is contained in:
Shea Levy 2014-02-26 10:06:28 -05:00
parent efb18d9aa5
commit 69b6b939ef

View File

@ -56,7 +56,7 @@ let
inherit visible;
});
}
{ config = setTo (mkIf (fromOf options).isDefined (define (mkMerge (fromOf options).definitions)));
{ config = setTo (mkMerge (if (fromOf options).isDefined then [ (define (mkMerge (fromOf options).definitions)) ] else []));
}
];