summary refs log tree commit diff
path: root/nixos
diff options
context:
space:
mode:
authorNicolas B. Pierron <nicolas.b.pierron@gmail.com>2014-12-22 22:38:38 +0100
committerNicolas B. Pierron <nicolas.b.pierron@gmail.com>2014-12-22 22:38:38 +0100
commitd7f29acd48f27f3ad0aa13b47c489f3d4bfda362 (patch)
treede869876c1a1112067e34009dd420b3dfad27fe3 /nixos
parent4e558732e7714ad69a6d0ad2b052f2efdde76376 (diff)
downloadnixlib-d7f29acd48f27f3ad0aa13b47c489f3d4bfda362.tar
nixlib-d7f29acd48f27f3ad0aa13b47c489f3d4bfda362.tar.gz
nixlib-d7f29acd48f27f3ad0aa13b47c489f3d4bfda362.tar.bz2
nixlib-d7f29acd48f27f3ad0aa13b47c489f3d4bfda362.tar.lz
nixlib-d7f29acd48f27f3ad0aa13b47c489f3d4bfda362.tar.xz
nixlib-d7f29acd48f27f3ad0aa13b47c489f3d4bfda362.tar.zst
nixlib-d7f29acd48f27f3ad0aa13b47c489f3d4bfda362.zip
modules: Extract mkAliasDefinition from the rename.nix NixOS module.
Diffstat (limited to 'nixos')
-rw-r--r--nixos/modules/rename.nix4
1 files changed, 2 insertions, 2 deletions
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));
         }
       ];