swendel/nixpkgs
1
0
Fork 0
mirror of https://github.com/SebastianWendel/nixpkgs.git synced 2024-09-20 20:39:04 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #41367 from andir/nixos-mpd-dbFile-null

Browse source 
nixos/mpd: allow services.mpd.dbFile to be null
This commit is contained in:
Andreas Rammhold 2018-06-01 19:39:17 +02:00 committed by GitHub
parent 44659fcbe1 a0797bad2c
commit bc069622dd
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
nixos/modules/services/audio/mpd.nix
View file

@ -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.
'';
};
};