From 97e96b7f45e1762cfe197e1a89ed96c48c099dba Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Thu, 30 Oct 2025 10:52:17 +0200 Subject: [PATCH] nixosTests.mpd: don't explicitly set default musicDirectory --- nixos/tests/mpd.nix | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/nixos/tests/mpd.nix b/nixos/tests/mpd.nix index 347bcff1b829..9fe1579169d4 100644 --- a/nixos/tests/mpd.nix +++ b/nixos/tests/mpd.nix @@ -9,11 +9,10 @@ let meta.license = lib.licenses.cc-by-sa-40; }; - defaultMpdCfg = rec { + defaultMpdCfg = { user = "mpd"; group = "mpd"; dataDir = "/var/lib/mpd"; - musicDirectory = "${dataDir}/music"; enable = true; }; @@ -21,7 +20,7 @@ let { user, group, - musicDirectory, + dataDir, }: { description = "Sets up the music file(s) for MPD to use."; @@ -29,7 +28,7 @@ let after = [ "mpd.service" ]; wantedBy = [ "default.target" ]; script = '' - cp ${track} ${musicDirectory} + cp ${track} ${dataDir}/music ''; serviceConfig = { User = user; @@ -68,7 +67,7 @@ in } ''; }; - musicService = musicService { inherit (defaultMpdCfg) user group musicDirectory; }; + musicService = musicService { inherit (defaultMpdCfg) user group dataDir; }; }) { networking.firewall.allowedTCPPorts = [ 6600 ]; } ]; @@ -86,7 +85,7 @@ in ''; }; - musicService = musicService { inherit (defaultMpdCfg) user group musicDirectory; }; + musicService = musicService { inherit (defaultMpdCfg) user group dataDir; }; }) { services.pulseaudio = {