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

nixos/mpd: allow setting null db_file (#485884)

parents 1dc3d859 64c3b894

nixos/modules/services/audio/mpd.nix

+4 −2
Original line number Diff line number Diff line
@@ -26,7 +26,9 @@ let 
          "\"" + (toString v) + "\""

      )

    ) a;

  nonBlockSettings = lib.filterAttrs (n: v: !(builtins.isAttrs v || builtins.isList v)) cfg.settings;

  nonBlockSettings = lib.filterAttrs (

    n: v: !(builtins.isAttrs v || builtins.isList v || isNull v)

  ) cfg.settings;

  pureBlockSettings = removeAttrs cfg.settings (builtins.attrNames nonBlockSettings);

  blocks =

    pureBlockSettings
@@ -221,7 +223,7 @@ in 
            };



            db_file = lib.mkOption {

              type = lib.types.path;

              type = lib.types.nullOr lib.types.path;

              default = "${cfg.dataDir}/tag_cache";

              defaultText = lib.literalExpression ''"''${dataDir}/tag_cache"'';

              description = ''