diff --git a/lib/modules.nix b/lib/modules.nix index c53cd8185e91..474040c270df 100644 --- a/lib/modules.nix +++ b/lib/modules.nix @@ -1043,10 +1043,11 @@ let ( res: opt: let - mergedType = res.type.typeMerge opt.options.type.functor; - typeSet = if opt.options ? type && res ? type then + let + mergedType = res.type.typeMerge opt.options.type.functor; + in if mergedType != null then { type = mergedType;