b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

moc: always use newest ffmpeg

Browse source
This commit is contained in:
Robert Schütz 2021-05-18 12:10:07 +02:00 committed by Matthieu Coudron
parent 9971c5d1a4
commit b4fd56d50b
1 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
pkgs/applications/audio/moc/default.nix
View file

@ -14,11 +14,10 @@
, musepackSupport ? true, libmpc, libmpcdec, taglib , musepackSupport ? true, libmpc, libmpcdec, taglib
, vorbisSupport ? true, libvorbis , vorbisSupport ? true, libvorbis
, speexSupport ? true, speex , speexSupport ? true, speex
, ffmpegSupport ? true, ffmpeg_3 , ffmpegSupport ? true, ffmpeg
, sndfileSupport ? true, libsndfile , sndfileSupport ? true, libsndfile
, wavpackSupport ? true, wavpack , wavpackSupport ? true, wavpack
# Misc # Misc
, withffmpeg4 ? false, ffmpeg_4
, curlSupport ? true, curl , curlSupport ? true, curl
, samplerateSupport ? true, libsamplerate , samplerateSupport ? true, libsamplerate
, withDebug ? false , withDebug ? false
@ -39,7 +38,7 @@ in stdenv.mkDerivation rec {
}; };
patches = [] patches = []
++ opt withffmpeg4 ./moc-ffmpeg4.patch ++ opt ffmpegSupport ./moc-ffmpeg4.patch
++ opt pulseSupport ./pulseaudio.patch; ++ opt pulseSupport ./pulseaudio.patch;
nativeBuildInputs = [ pkg-config ] nativeBuildInputs = [ pkg-config ]
@ -60,8 +59,7 @@ in stdenv.mkDerivation rec {
++ lib.optionals musepackSupport [ libmpc libmpcdec taglib ] ++ lib.optionals musepackSupport [ libmpc libmpcdec taglib ]
++ opt vorbisSupport libvorbis ++ opt vorbisSupport libvorbis
++ opt speexSupport speex ++ opt speexSupport speex
++ opt (ffmpegSupport && !withffmpeg4) ffmpeg_3 ++ opt ffmpegSupport ffmpeg
++ opt (ffmpegSupport && withffmpeg4) ffmpeg_4
++ opt sndfileSupport libsndfile ++ opt sndfileSupport libsndfile
++ opt wavpackSupport wavpack ++ opt wavpackSupport wavpack
# Misc # Misc