diff options
| author | Johannes Frankenau <johannes@frankenau.net> | 2018-07-21 23:19:34 +0200 |
|---|---|---|
| committer | Johannes Frankenau <johannes@frankenau.net> | 2018-08-03 21:36:38 +0200 |
| commit | b9234ea49c6bfb71d1435fd584ae83123f61fa67 (patch) | |
| tree | fb5b7319ee265a8a125f5660f64d0ccd715e46bb | |
| parent | fbcc4daff7652ad630e7bb0d6ae71467aa2609e3 (diff) | |
| download | nixlib-b9234ea49c6bfb71d1435fd584ae83123f61fa67.tar nixlib-b9234ea49c6bfb71d1435fd584ae83123f61fa67.tar.gz nixlib-b9234ea49c6bfb71d1435fd584ae83123f61fa67.tar.bz2 nixlib-b9234ea49c6bfb71d1435fd584ae83123f61fa67.tar.lz nixlib-b9234ea49c6bfb71d1435fd584ae83123f61fa67.tar.xz nixlib-b9234ea49c6bfb71d1435fd584ae83123f61fa67.tar.zst nixlib-b9234ea49c6bfb71d1435fd584ae83123f61fa67.zip | |
nixos/mpd: allow storage plugins in musicDirectory
| -rw-r--r-- | nixos/modules/services/audio/mpd.nix | 4 | ||||
| -rw-r--r-- | pkgs/servers/mpd/default.nix | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/nixos/modules/services/audio/mpd.nix b/nixos/modules/services/audio/mpd.nix index 3add6556d0df..5bfe2b6a22ad 100644 --- a/nixos/modules/services/audio/mpd.nix +++ b/nixos/modules/services/audio/mpd.nix @@ -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. ''; }; diff --git a/pkgs/servers/mpd/default.nix b/pkgs/servers/mpd/default.nix index d22beac6e9da..b88b13cdf16f 100644 --- a/pkgs/servers/mpd/default.nix +++ b/pkgs/servers/mpd/default.nix @@ -84,8 +84,8 @@ in stdenv.mkDerivation rec { ++ opt clientSupport mpd_clientlib ++ opt opusSupport libopus ++ opt soundcloudSupport yajl - ++ opt nfsSupport libnfs - ++ opt smbSupport smbclient; + ++ opt (!stdenv.isDarwin && nfsSupport) libnfs + ++ opt (!stdenv.isDarwin && smbSupport) smbclient; nativeBuildInputs = [ autoreconfHook pkgconfig ]; @@ -120,8 +120,8 @@ in stdenv.mkDerivation rec { (mkFlag clientSupport "libmpdclient") (mkFlag opusSupport "opus") (mkFlag soundcloudSupport "soundcloud") - (mkFlag nfsSupport "libnfs") - (mkFlag smbSupport "smbclient") + (mkFlag (!stdenv.isDarwin && nfsSupport) "libnfs") + (mkFlag (!stdenv.isDarwin && smbSupport) "smbclient") "--enable-debug" "--with-zeroconf=avahi" ] |