diff options
| author | Silvan Mosberger <contact@infinisil.com> | 2020-08-04 00:08:43 +0200 |
|---|---|---|
| committer | Silvan Mosberger <contact@infinisil.com> | 2020-08-10 17:27:33 +0200 |
| commit | e0ded8f4ba1529fdde28ff027d370c883864fcc8 (patch) | |
| tree | cc4074076db653bdfa106d1a93a0ad90211eac64 /lib/modules.nix | |
| parent | 446d80d28deb9929aca2a70699b3f32c2f1297d5 (diff) | |
| download | nixpkgs-e0ded8f4ba1529fdde28ff027d370c883864fcc8.tar nixpkgs-e0ded8f4ba1529fdde28ff027d370c883864fcc8.tar.gz nixpkgs-e0ded8f4ba1529fdde28ff027d370c883864fcc8.tar.bz2 nixpkgs-e0ded8f4ba1529fdde28ff027d370c883864fcc8.tar.lz nixpkgs-e0ded8f4ba1529fdde28ff027d370c883864fcc8.tar.xz nixpkgs-e0ded8f4ba1529fdde28ff027d370c883864fcc8.tar.zst nixpkgs-e0ded8f4ba1529fdde28ff027d370c883864fcc8.zip | |
lib/modules: Fix freeform modules when there's no definitions
Diffstat (limited to 'lib/modules.nix')
| -rw-r--r-- | lib/modules.nix | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/modules.nix b/lib/modules.nix index daffe5224ab..1d2c4a1acbb 100644 --- a/lib/modules.nix +++ b/lib/modules.nix @@ -104,7 +104,8 @@ rec { file = def.file; value = setAttrByPath def.prefix def.value; }) merged.unmatchedDefns; - in declaredConfig._module.freeformType.merge prefix defs; + in if defs == [] then {} + else declaredConfig._module.freeformType.merge prefix defs; in if declaredConfig._module.freeformType == null then declaredConfig # Because all definitions that had an associated option ended in |