From 95afd78e868c9d06ad3d7e013cf4f81ef99507f5 Mon Sep 17 00:00:00 2001 From: Johannes Kirschbauer Date: Sun, 14 Dec 2025 21:34:12 +0100 Subject: [PATCH] lib/modules: inline trivial 'mkAliasIfDef' --- lib/modules.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/modules.nix b/lib/modules.nix index f52469c9873d..bb8faf06c9d6 100644 --- a/lib/modules.nix +++ b/lib/modules.nix @@ -1528,7 +1528,7 @@ let # mkDefault properties of the previous option. # mkAliasDefinitions = mkAliasAndWrapDefinitions id; - mkAliasAndWrapDefinitions = wrap: option: mkAliasIfDef option (wrap (mkMerge option.definitions)); + mkAliasAndWrapDefinitions = wrap: option: mkIf option.isDefined (wrap (mkMerge option.definitions)); # Similar to mkAliasAndWrapDefinitions but copies over the priority from the # option as well. @@ -1540,7 +1540,7 @@ let prio = option.highestPrio or defaultOverridePriority; defsWithPrio = map (mkOverride prio) option.definitions; in - mkAliasIfDef option (wrap (mkMerge defsWithPrio)); + mkIf option.isDefined (wrap (mkMerge defsWithPrio)); mkAliasIfDef = option: mkIf option.isDefined;