public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

nixos/mpd: allow storage plugins in musicDirectory

Browse Source
This commit is contained in:
Johannes Frankenau 2018-07-21 23:19:34 +02:00
parent fbcc4daff7
commit b9234ea49c
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
nixos/modules/services/audio/mpd.nix
View File

@ -55,11 +55,11 @@ in {
}; };
musicDirectory = mkOption { musicDirectory = mkOption {
type = types.path; type = with types; either path (strMatching "(http|https|nfs|smb)://.+");
default = "${cfg.dataDir}/music"; default = "${cfg.dataDir}/music";
defaultText = ''''${dataDir}/music''; defaultText = ''''${dataDir}/music'';
description = '' description = ''
The directory where mpd reads music from. The directory or NFS/SMB network share where mpd reads music from.
''; '';
}; };

8
pkgs/servers/mpd/default.nix
View File

@ -84,8 +84,8 @@ in stdenv.mkDerivation rec {
++ opt clientSupport mpd_clientlib ++ opt clientSupport mpd_clientlib
++ opt opusSupport libopus ++ opt opusSupport libopus
++ opt soundcloudSupport yajl ++ opt soundcloudSupport yajl
++ opt nfsSupport libnfs ++ opt (!stdenv.isDarwin && nfsSupport) libnfs
++ opt smbSupport smbclient; ++ opt (!stdenv.isDarwin && smbSupport) smbclient;
nativeBuildInputs = [ autoreconfHook pkgconfig ]; nativeBuildInputs = [ autoreconfHook pkgconfig ];
@ -120,8 +120,8 @@ in stdenv.mkDerivation rec {
(mkFlag clientSupport "libmpdclient") (mkFlag clientSupport "libmpdclient")
(mkFlag opusSupport "opus") (mkFlag opusSupport "opus")
(mkFlag soundcloudSupport "soundcloud") (mkFlag soundcloudSupport "soundcloud")
(mkFlag nfsSupport "libnfs") (mkFlag (!stdenv.isDarwin && nfsSupport) "libnfs")
(mkFlag smbSupport "smbclient") (mkFlag (!stdenv.isDarwin && smbSupport) "smbclient")
"--enable-debug" "--enable-debug"
"--with-zeroconf=avahi" "--with-zeroconf=avahi"
] ]