summary refs log tree commit diff
path: root/nixos/modules/rename.nix
diff options
context:
space:
mode:
authorShea Levy <shea@shealevy.com>2014-02-26 10:06:28 -0500
committerShea Levy <shea@shealevy.com>2014-02-26 10:06:28 -0500
commit69b6b939efbc17ec9cedde521763ea26c29982b3 (patch)
tree17007957d1bac1a67eed8df7b8e035aa1629afd4 /nixos/modules/rename.nix
parentefb18d9aa5b82414b39668afdd9d975e2906ac3a (diff)
downloadnixlib-69b6b939efbc17ec9cedde521763ea26c29982b3.tar
nixlib-69b6b939efbc17ec9cedde521763ea26c29982b3.tar.gz
nixlib-69b6b939efbc17ec9cedde521763ea26c29982b3.tar.bz2
nixlib-69b6b939efbc17ec9cedde521763ea26c29982b3.tar.lz
nixlib-69b6b939efbc17ec9cedde521763ea26c29982b3.tar.xz
nixlib-69b6b939efbc17ec9cedde521763ea26c29982b3.tar.zst
nixlib-69b6b939efbc17ec9cedde521763ea26c29982b3.zip
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>
Diffstat (limited to 'nixos/modules/rename.nix')
-rw-r--r--nixos/modules/rename.nix2
1 files changed, 1 insertions, 1 deletions
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 []));
         }
       ];