From 69b6b939efbc17ec9cedde521763ea26c29982b3 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Wed, 26 Feb 2014 10:06:28 -0500
Subject: 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>
---
 nixos/modules/rename.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'nixos/modules/rename.nix')

diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix
index f41bababd293..1a08a1cf4f35 100644
--- a/nixos/modules/rename.nix
+++ b/nixos/modules/rename.nix
@@ -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 []));
         }
       ];
 
-- 
cgit 1.4.1