git.iko.soy/typeable/nixpkgs
on master help sign in
moc: always use newest ffmpeg
commitb4fd56d50b3caeb21b672cf5c8f6f2aa70173840 authorRobert Schütz <dev@schuetz-co.de> dateTue 18 May 2021, 12:10 (5 years ago) parent9971c5d
1 file changed+3−5
pkgs/applications/audio/moc/default.nix+3−5
pkgs/applications/audio/moc/default.nix+3−5
@@ -14,11 +14,10 @@
1414, musepackSupport ? true, libmpc, libmpcdec, taglib
1515, vorbisSupport ? true, libvorbis
1616, speexSupport ? true, speex
17−, ffmpegSupport ? true, ffmpeg_3
17+, ffmpegSupport ? true, ffmpeg
1818, sndfileSupport ? true, libsndfile
1919, wavpackSupport ? true, wavpack
2020# Misc
21−, withffmpeg4 ? false, ffmpeg_4
2221, curlSupport ? true, curl
2322, samplerateSupport ? true, libsamplerate
2423, withDebug ? false
@@ -39,7 +38,7 @@ in stdenv.mkDerivation rec {
3938 };
4039
4140 patches = []
42− ++ opt withffmpeg4 ./moc-ffmpeg4.patch
41+ ++ opt ffmpegSupport ./moc-ffmpeg4.patch
4342 ++ opt pulseSupport ./pulseaudio.patch;
4443
4544 nativeBuildInputs = [ pkg-config ]
@@ -60,8 +59,7 @@ in stdenv.mkDerivation rec {
6059 ++ lib.optionals musepackSupport [ libmpc libmpcdec taglib ]
6160 ++ opt vorbisSupport libvorbis
6261 ++ opt speexSupport speex
63− ++ opt (ffmpegSupport && !withffmpeg4) ffmpeg_3
64− ++ opt (ffmpegSupport && withffmpeg4) ffmpeg_4
62+ ++ opt ffmpegSupport ffmpeg
6563 ++ opt sndfileSupport libsndfile
6664 ++ opt wavpackSupport wavpack
6765 # Misc