diff options
| author | Jan Malakhovski <oxij@oxij.org> | 2018-04-28 20:05:00 +0000 |
|---|---|---|
| committer | Jan Malakhovski <oxij@oxij.org> | 2018-06-11 15:06:27 +0000 |
| commit | c0c43e9c0767bb49a836d165f2b542a3e1334362 (patch) | |
| tree | e761fed6d2ae750e866aebc2883edbf59f73cd08 /lib/modules.nix | |
| parent | a1f226b78b5e6ed383aa584d71044fd5cf53753b (diff) | |
| download | nixpkgs-c0c43e9c0767bb49a836d165f2b542a3e1334362.tar nixpkgs-c0c43e9c0767bb49a836d165f2b542a3e1334362.tar.gz nixpkgs-c0c43e9c0767bb49a836d165f2b542a3e1334362.tar.bz2 nixpkgs-c0c43e9c0767bb49a836d165f2b542a3e1334362.tar.lz nixpkgs-c0c43e9c0767bb49a836d165f2b542a3e1334362.tar.xz nixpkgs-c0c43e9c0767bb49a836d165f2b542a3e1334362.tar.zst nixpkgs-c0c43e9c0767bb49a836d165f2b542a3e1334362.zip | |
lib: simplify `mkAliasAndWrapDefinitions`
Diffstat (limited to 'lib/modules.nix')
| -rw-r--r-- | lib/modules.nix | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/lib/modules.nix b/lib/modules.nix index 8baae491705..19e553bbc9b 100644 --- a/lib/modules.nix +++ b/lib/modules.nix @@ -532,9 +532,7 @@ rec { # mkAliasDefinitions = mkAliasAndWrapDefinitions id; mkAliasAndWrapDefinitions = wrap: option: - mkMerge - (optional (isOption option && option.isDefined) - (wrap (mkMerge option.definitions))); + mkIf (isOption option && option.isDefined) (wrap (mkMerge option.definitions)); /* Compatibility. */ |