From a0797bad2c9ea3781367703bb603ab21e5d64d3e Mon Sep 17 00:00:00 2001
From: Andreas Rammhold <andreas@rammhold.de>
Date: Fri, 1 Jun 2018 13:37:43 +0200
Subject: [PATCH] nixos/mpd: allow services.mpd.dbFile to be null
This change allows users to specify an alternative database method. For
example an mpd satellite setup where another mpd on the network shares
it's database with the local instance. The `dbFile` parameter must not be
configured in that case.
---
nixos/modules/services/audio/mpd.nix | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/nixos/modules/services/audio/mpd.nix b/nixos/modules/services/audio/mpd.nix
index 5f379b392ea..500a9e35a13 100644
--- a/nixos/modules/services/audio/mpd.nix
+++ b/nixos/modules/services/audio/mpd.nix
@@ -13,7 +13,9 @@ let
mpdConf = pkgs.writeText "mpd.conf" ''
music_directory "${cfg.musicDirectory}"
playlist_directory "${cfg.playlistDirectory}"
- db_file "${cfg.dbFile}"
+ ${lib.optionalString (cfg.dbFile != null) ''
+ db_file "${cfg.dbFile}"
+ ''}
state_file "${cfg.dataDir}/state"
sticker_file "${cfg.dataDir}/sticker.sql"
log_file "syslog"
@@ -126,11 +128,12 @@ in {
};
dbFile = mkOption {
- type = types.str;
+ type = types.nullOr types.str;
default = "${cfg.dataDir}/tag_cache";
defaultText = ''''${dataDir}/tag_cache'';
description = ''
- The path to MPD's database.
+ The path to MPD's database. If set to <literal>null</literal> the
+ paramter is omitted from the configuration.
'';
};
};