Unverified Commit d7b459f9 authored by Martin Weinelt's avatar Martin Weinelt Committed by GitHub
Browse files

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

parents 645aeb7d e1b4daab

nixos/modules/services/audio/mpd.nix

+3 −4
Original line number Diff line number Diff line
@@ -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 {