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

Merge pull request #43934 from jfrankenau/mpd-smb

Browse Source 
mpd: add nfs and smb support
This commit is contained in:
xeji 2018-08-03 21:59:30 +02:00 committed by GitHub
commit c9f3382a39
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 3 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 {
type = types.path;
type = with types; either path (strMatching "(http|https|nfs|smb)://.+");
default = "${cfg.dataDir}/music";
defaultText = ''''${dataDir}/music'';
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

@ -26,6 +26,8 @@
, clientSupport ? true, mpd_clientlib
, opusSupport ? true, libopus
, soundcloudSupport ? true, yajl
, nfsSupport ? true, libnfs
, smbSupport ? true, smbclient
}:
assert avahiSupport -> avahi != null && dbus != null;
@ -81,7 +83,9 @@ in stdenv.mkDerivation rec {
++ opt icuSupport icu
++ opt clientSupport mpd_clientlib
++ opt opusSupport libopus
++ opt soundcloudSupport yajl;
++ opt soundcloudSupport yajl
++ opt (!stdenv.isDarwin && nfsSupport) libnfs
++ opt (!stdenv.isDarwin && smbSupport) smbclient;
nativeBuildInputs = [ autoreconfHook pkgconfig ];
@ -116,6 +120,8 @@ in stdenv.mkDerivation rec {
(mkFlag clientSupport "libmpdclient")
(mkFlag opusSupport "opus")
(mkFlag soundcloudSupport "soundcloud")
(mkFlag (!stdenv.isDarwin && nfsSupport) "libnfs")
(mkFlag (!stdenv.isDarwin && smbSupport) "smbclient")
"--enable-debug"
"--with-zeroconf=avahi"
]