From d7f29acd48f27f3ad0aa13b47c489f3d4bfda362 Mon Sep 17 00:00:00 2001
From: "Nicolas B. Pierron" <nicolas.b.pierron@gmail.com>
Date: Mon, 22 Dec 2014 22:38:38 +0100
Subject: modules: Extract mkAliasDefinition from the rename.nix NixOS module.

---
 nixos/modules/rename.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'nixos')

diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix
index cb1b92e78d62..20fd76855d96 100644
--- a/nixos/modules/rename.nix
+++ b/nixos/modules/rename.nix
@@ -55,8 +55,8 @@ let
             apply = x: use (toOf config);
             inherit visible;
           });
-        }
-        { config = setTo (mkMerge (if (fromOf options).isDefined then [ (define (mkMerge (fromOf options).definitions)) ] else []));
+
+          config = setTo (mkAliasAndWrapDefinitions define (fromOf options));
         }
       ];
 
-- 
cgit 1.4.1