diff options
| author | xeji <36407913+xeji@users.noreply.github.com> | 2018-08-03 21:59:30 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-03 21:59:30 +0200 |
| commit | c9f3382a39c8453ed5e1dccdba4ca486eae7a29e (patch) | |
| tree | 9af3f952920fda9fa9943fc2d704e7300e91c64f /pkgs/servers | |
| parent | af176db5d725b2213139ac46699a4e6a59d5e994 (diff) | |
| parent | b9234ea49c6bfb71d1435fd584ae83123f61fa67 (diff) | |
| download | nixlib-c9f3382a39c8453ed5e1dccdba4ca486eae7a29e.tar nixlib-c9f3382a39c8453ed5e1dccdba4ca486eae7a29e.tar.gz nixlib-c9f3382a39c8453ed5e1dccdba4ca486eae7a29e.tar.bz2 nixlib-c9f3382a39c8453ed5e1dccdba4ca486eae7a29e.tar.lz nixlib-c9f3382a39c8453ed5e1dccdba4ca486eae7a29e.tar.xz nixlib-c9f3382a39c8453ed5e1dccdba4ca486eae7a29e.tar.zst nixlib-c9f3382a39c8453ed5e1dccdba4ca486eae7a29e.zip | |
Merge pull request #43934 from jfrankenau/mpd-smb
mpd: add nfs and smb support
Diffstat (limited to 'pkgs/servers')
| -rw-r--r-- | pkgs/servers/mpd/default.nix | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/pkgs/servers/mpd/default.nix b/pkgs/servers/mpd/default.nix index f8523e8607d3..6ca338471119 100644 --- a/pkgs/servers/mpd/default.nix +++ b/pkgs/servers/mpd/default.nix @@ -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" ] |