diff options
Diffstat (limited to 'pkgs/applications/audio/moc/default.nix')
| -rw-r--r-- | pkgs/applications/audio/moc/default.nix | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/pkgs/applications/audio/moc/default.nix b/pkgs/applications/audio/moc/default.nix index 51d197fb0e0..783ef2dbb7d 100644 --- a/pkgs/applications/audio/moc/default.nix +++ b/pkgs/applications/audio/moc/default.nix @@ -14,11 +14,10 @@ , musepackSupport ? true, libmpc, libmpcdec, taglib , vorbisSupport ? true, libvorbis , speexSupport ? true, speex -, ffmpegSupport ? true, ffmpeg_3 +, ffmpegSupport ? true, ffmpeg , sndfileSupport ? true, libsndfile , wavpackSupport ? true, wavpack # Misc -, withffmpeg4 ? false, ffmpeg_4 , curlSupport ? true, curl , samplerateSupport ? true, libsamplerate , withDebug ? false @@ -39,7 +38,7 @@ in stdenv.mkDerivation rec { }; patches = [] - ++ opt withffmpeg4 ./moc-ffmpeg4.patch + ++ opt ffmpegSupport ./moc-ffmpeg4.patch ++ opt pulseSupport ./pulseaudio.patch; nativeBuildInputs = [ pkg-config ] @@ -60,8 +59,7 @@ in stdenv.mkDerivation rec { ++ lib.optionals musepackSupport [ libmpc libmpcdec taglib ] ++ opt vorbisSupport libvorbis ++ opt speexSupport speex - ++ opt (ffmpegSupport && !withffmpeg4) ffmpeg_3 - ++ opt (ffmpegSupport && withffmpeg4) ffmpeg_4 + ++ opt ffmpegSupport ffmpeg ++ opt sndfileSupport libsndfile ++ opt wavpackSupport wavpack # Misc |