nixos/mpd: correctly handle null valued cfg.settings (#488114)

This commit is contained in:
Martin Weinelt
2026-02-07 23:02:39 +00:00
committed by GitHub
+3 -4
View File
@@ -26,10 +26,9 @@ let
"\"" + (toString v) + "\""
)
) a;
nonBlockSettings = lib.filterAttrs (
n: v: !(builtins.isAttrs v || builtins.isList v || isNull v)
) cfg.settings;
pureBlockSettings = removeAttrs cfg.settings (builtins.attrNames nonBlockSettings);
settings = lib.filterAttrs (n: v: !(isNull v)) cfg.settings;
nonBlockSettings = lib.filterAttrs (n: v: !(builtins.isAttrs v || builtins.isList v)) settings;
pureBlockSettings = removeAttrs settings (builtins.attrNames nonBlockSettings);
blocks =
pureBlockSettings
// lib.optionalAttrs cfg.fluidsynth {