Merge pull request #43934 from jfrankenau/mpd-smb
mpd: add nfs and smb support
This commit is contained in:
commit
c9f3382a39
|
@ -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.
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -26,6 +26,8 @@
|
||||||
, clientSupport ? true, mpd_clientlib
|
, clientSupport ? true, mpd_clientlib
|
||||||
, opusSupport ? true, libopus
|
, opusSupport ? true, libopus
|
||||||
, soundcloudSupport ? true, yajl
|
, soundcloudSupport ? true, yajl
|
||||||
|
, nfsSupport ? true, libnfs
|
||||||
|
, smbSupport ? true, smbclient
|
||||||
}:
|
}:
|
||||||
|
|
||||||
assert avahiSupport -> avahi != null && dbus != null;
|
assert avahiSupport -> avahi != null && dbus != null;
|
||||||
|
@ -81,7 +83,9 @@ in stdenv.mkDerivation rec {
|
||||||
++ opt icuSupport icu
|
++ opt icuSupport icu
|
||||||
++ opt clientSupport mpd_clientlib
|
++ opt clientSupport mpd_clientlib
|
||||||
++ opt opusSupport libopus
|
++ opt opusSupport libopus
|
||||||
++ opt soundcloudSupport yajl;
|
++ opt soundcloudSupport yajl
|
||||||
|
++ opt (!stdenv.isDarwin && nfsSupport) libnfs
|
||||||
|
++ opt (!stdenv.isDarwin && smbSupport) smbclient;
|
||||||
|
|
||||||
nativeBuildInputs = [ autoreconfHook pkgconfig ];
|
nativeBuildInputs = [ autoreconfHook pkgconfig ];
|
||||||
|
|
||||||
|
@ -116,6 +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 (!stdenv.isDarwin && nfsSupport) "libnfs")
|
||||||
|
(mkFlag (!stdenv.isDarwin && smbSupport) "smbclient")
|
||||||
"--enable-debug"
|
"--enable-debug"
|
||||||
"--with-zeroconf=avahi"
|
"--with-zeroconf=avahi"
|
||||||
]
|
]
|
||||||
|
|
Loading…
Reference in a new issue