diff options
44 files changed, 91 insertions, 97 deletions
diff --git a/pkgs/applications/audio/moc/default.nix b/pkgs/applications/audio/moc/default.nix index bd524b6d931..ddd868c71ce 100644 --- a/pkgs/applications/audio/moc/default.nix +++ b/pkgs/applications/audio/moc/default.nix @@ -15,7 +15,7 @@ , musepackSupport ? true, libmpc, libmpcdec, taglib , vorbisSupport ? true, libvorbis , speexSupport ? true, speex -, ffmpegSupport ? true, ffmpeg +, ffmpegSupport ? true, ffmpeg_4 , sndfileSupport ? true, libsndfile , wavpackSupport ? true, wavpack # Misc @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { ++ lib.optionals musepackSupport [ libmpc libmpcdec taglib ] ++ lib.optional vorbisSupport libvorbis ++ lib.optional speexSupport speex - ++ lib.optional ffmpegSupport ffmpeg + ++ lib.optional ffmpegSupport ffmpeg_4 ++ lib.optional sndfileSupport libsndfile ++ lib.optional wavpackSupport wavpack # Misc diff --git a/pkgs/applications/audio/musly/default.nix b/pkgs/applications/audio/musly/default.nix index 470d5c10507..1ae6624637a 100644 --- a/pkgs/applications/audio/musly/default.nix +++ b/pkgs/applications/audio/musly/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, eigen, ffmpeg }: +{ lib, stdenv, fetchFromGitHub, cmake, eigen, ffmpeg_4 }: stdenv.mkDerivation { pname = "musly"; version = "unstable-2017-04-26"; @@ -9,7 +9,7 @@ stdenv.mkDerivation { sha256 = "1q42wvdwy2pac7bhfraqqj2czw7w2m33ms3ifjl8phm7d87i8825"; }; nativeBuildInputs = [ cmake ]; - buildInputs = [ eigen ffmpeg ]; + buildInputs = [ eigen ffmpeg_4 ]; fixupPhase = lib.optionalString stdenv.isDarwin '' install_name_tool -change libmusly.dylib $out/lib/libmusly.dylib $out/bin/musly install_name_tool -change libmusly_resample.dylib $out/lib/libmusly_resample.dylib $out/bin/musly diff --git a/pkgs/applications/audio/spek/default.nix b/pkgs/applications/audio/spek/default.nix index 0c1aa5fa0e2..0ce5eb2cfab 100644 --- a/pkgs/applications/audio/spek/default.nix +++ b/pkgs/applications/audio/spek/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, intltool, pkg-config, ffmpeg, wxGTK32, gtk3, wrapGAppsHook }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook, intltool, pkg-config, ffmpeg_4, wxGTK32, gtk3, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "spek"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook intltool pkg-config wrapGAppsHook ]; - buildInputs = [ ffmpeg wxGTK32 gtk3 ]; + buildInputs = [ ffmpeg_4 wxGTK32 gtk3 ]; meta = with lib; { description = "Analyse your audio files by showing their spectrogram"; diff --git a/pkgs/applications/audio/tenacity/default.nix b/pkgs/applications/audio/tenacity/default.nix index c27e3864d27..ae4454a6dc0 100644 --- a/pkgs/applications/audio/tenacity/default.nix +++ b/pkgs/applications/audio/tenacity/default.nix @@ -30,7 +30,7 @@ , expat , libid3tag , libopus -, ffmpeg +, ffmpeg_4 , soundtouch , pcre , portaudio @@ -110,7 +110,7 @@ stdenv.mkDerivation rec { buildInputs = [ alsa-lib expat - ffmpeg + ffmpeg_4 file flac glib diff --git a/pkgs/applications/emulators/attract-mode/default.nix b/pkgs/applications/emulators/attract-mode/default.nix index 4f560e64a1a..0bd1b4b062a 100644 --- a/pkgs/applications/emulators/attract-mode/default.nix +++ b/pkgs/applications/emulators/attract-mode/default.nix @@ -1,4 +1,4 @@ -{ expat, fetchFromGitHub, ffmpeg, fontconfig, freetype, libarchive, libjpeg +{ expat, fetchFromGitHub, ffmpeg_4, fontconfig, freetype, libarchive, libjpeg , libGLU, libGL, openal, pkg-config, sfml, lib, stdenv, zlib }: @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { ''; buildInputs = [ - expat ffmpeg fontconfig freetype libarchive libjpeg libGLU libGL openal sfml zlib + expat ffmpeg_4 fontconfig freetype libarchive libjpeg libGLU libGL openal sfml zlib ]; meta = with lib; { diff --git a/pkgs/applications/emulators/citra/generic.nix b/pkgs/applications/emulators/citra/generic.nix index ee34286c3d1..95f66294deb 100644 --- a/pkgs/applications/emulators/citra/generic.nix +++ b/pkgs/applications/emulators/citra/generic.nix @@ -20,7 +20,7 @@ , enableCubeb ? true, libpulseaudio , enableFfmpegAudioDecoder ? true , enableFfmpegVideoDumper ? true -, ffmpeg +, ffmpeg_4 , useDiscordRichPresence ? true, rapidjson , enableFdk ? false, fdk_aac }: @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { ++ lib.optional enableSdl2 SDL2 ++ lib.optional enableQtTranslation qttools ++ lib.optional enableCubeb libpulseaudio - ++ lib.optional (enableFfmpegAudioDecoder || enableFfmpegVideoDumper) ffmpeg + ++ lib.optional (enableFfmpegAudioDecoder || enableFfmpegVideoDumper) ffmpeg_4 ++ lib.optional useDiscordRichPresence rapidjson ++ lib.optional enableFdk fdk_aac; diff --git a/pkgs/applications/emulators/pcsxr/default.nix b/pkgs/applications/emulators/pcsxr/default.nix index 88a058865ea..101fb829c6e 100644 --- a/pkgs/applications/emulators/pcsxr/default.nix +++ b/pkgs/applications/emulators/pcsxr/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, autoreconfHook, intltool, pkg-config, gtk3, SDL2, xorg -, wrapGAppsHook, libcdio, nasm, ffmpeg, file +, wrapGAppsHook, libcdio, nasm, ffmpeg_4, file , fetchpatch }: stdenv.mkDerivation rec { @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook intltool pkg-config wrapGAppsHook ]; buildInputs = [ - gtk3 SDL2 xorg.libXv xorg.libXtst libcdio nasm ffmpeg file + gtk3 SDL2 xorg.libXv xorg.libXtst libcdio nasm ffmpeg_4 file xorg.libXxf86vm ]; diff --git a/pkgs/applications/emulators/ppsspp/default.nix b/pkgs/applications/emulators/ppsspp/default.nix index 7713c145948..29b64ebb6bd 100644 --- a/pkgs/applications/emulators/ppsspp/default.nix +++ b/pkgs/applications/emulators/ppsspp/default.nix @@ -4,7 +4,7 @@ , SDL2 , cmake , copyDesktopItems -, ffmpeg +, ffmpeg_4 , glew , libffi , libsForQt5 @@ -59,7 +59,7 @@ stdenv.mkDerivation (self: { buildInputs = [ SDL2 - ffmpeg + ffmpeg_4 (glew.override { enableEGL = forceWayland; }) libzip snappy diff --git a/pkgs/applications/emulators/retroarch/cores.nix b/pkgs/applications/emulators/retroarch/cores.nix index ed6b75ad406..043cd41d7a0 100644 --- a/pkgs/applications/emulators/retroarch/cores.nix +++ b/pkgs/applications/emulators/retroarch/cores.nix @@ -7,6 +7,7 @@ , curl , fetchFromGitHub , ffmpeg +, ffmpeg_4 , fluidsynth , gettext , hexdump @@ -759,7 +760,7 @@ in ppsspp = mkLibretroCore { core = "ppsspp"; extraNativeBuildInputs = [ cmake pkg-config python3 ]; - extraBuildInputs = [ libGLU libGL libzip ffmpeg snappy xorg.libX11 ]; + extraBuildInputs = [ libGLU libGL libzip ffmpeg_4 snappy xorg.libX11 ]; makefile = "Makefile"; cmakeFlags = [ "-DLIBRETRO=ON" diff --git a/pkgs/applications/graphics/digikam/default.nix b/pkgs/applications/graphics/digikam/default.nix index 19d0f5242e0..9f68964f424 100644 --- a/pkgs/applications/graphics/digikam/default.nix +++ b/pkgs/applications/graphics/digikam/default.nix @@ -24,7 +24,7 @@ , boost , eigen , exiv2 -, ffmpeg +, ffmpeg_4 , flex , graphviz , imagemagick @@ -70,7 +70,7 @@ mkDerivation rec { boost eigen exiv2 - ffmpeg + ffmpeg_4 flex graphviz imagemagick diff --git a/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/default.nix index 6e3a9e54f0d..d780ddad344 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/default.nix @@ -16,7 +16,7 @@ , kwayland , lz4 , xxHash -, ffmpeg +, ffmpeg_4 , openalSoft , minizip , libopus @@ -132,7 +132,7 @@ stdenv.mkDerivation rec { qtsvg lz4 xxHash - ffmpeg + ffmpeg_4 openalSoft minizip libopus diff --git a/pkgs/applications/science/biology/febio-studio/default.nix b/pkgs/applications/science/biology/febio-studio/default.nix index e334637f243..550d221c74e 100644 --- a/pkgs/applications/science/biology/febio-studio/default.nix +++ b/pkgs/applications/science/biology/febio-studio/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchFromGitHub, cmake, zlib, libglvnd, libGLU, wrapQtAppsHook , sshSupport ? true, openssl, libssh , tetgenSupport ? true, tetgen -, ffmpegSupport ? true, ffmpeg +, ffmpegSupport ? true, ffmpeg_4 , dicomSupport ? false, dcmtk , withModelRepo ? true , withCadFeatures ? false @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { buildInputs = [ zlib libglvnd libGLU openssl libssh ] ++ lib.optional sshSupport openssl ++ lib.optional tetgenSupport tetgen - ++ lib.optional ffmpegSupport ffmpeg + ++ lib.optional ffmpegSupport ffmpeg_4 ++ lib.optional dicomSupport dcmtk ; diff --git a/pkgs/applications/science/networking/sumo/default.nix b/pkgs/applications/science/networking/sumo/default.nix index 92f64fbfb91..7ed79f478cf 100644 --- a/pkgs/applications/science/networking/sumo/default.nix +++ b/pkgs/applications/science/networking/sumo/default.nix @@ -1,4 +1,4 @@ -{ lib, bzip2, cmake, eigen, fetchFromGitHub, ffmpeg, fox_1_6, gdal, +{ lib, bzip2, cmake, eigen, fetchFromGitHub, ffmpeg_4, fox_1_6, gdal, git, gl2ps, gpp , gtest, jdk, libGL, libGLU, libX11, libjpeg, libpng, libtiff, libxcrypt, openscenegraph , proj, python3, python3Packages, stdenv, swig, xercesc, xorg, zlib }: @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { buildInputs = [ bzip2 eigen - ffmpeg + ffmpeg_4 fox_1_6 gdal gl2ps diff --git a/pkgs/applications/video/bino3d/default.nix b/pkgs/applications/video/bino3d/default.nix index b1f5a693de4..d15d649b841 100644 --- a/pkgs/applications/video/bino3d/default.nix +++ b/pkgs/applications/video/bino3d/default.nix @@ -1,4 +1,4 @@ -{ mkDerivation, lib, fetchurl, pkg-config, ffmpeg, glew, libass, openal, qtbase }: +{ mkDerivation, lib, fetchurl, pkg-config, ffmpeg_4, glew, libass, openal, qtbase }: mkDerivation rec { pname = "bino"; @@ -11,7 +11,7 @@ mkDerivation rec { nativeBuildInputs = [ pkg-config ]; - buildInputs = [ ffmpeg glew libass openal qtbase ]; + buildInputs = [ ffmpeg_4 glew libass openal qtbase ]; enableParallelBuilding = true; diff --git a/pkgs/applications/video/bombono/default.nix b/pkgs/applications/video/bombono/default.nix index e39d09b6fe7..3990aeb662f 100644 --- a/pkgs/applications/video/bombono/default.nix +++ b/pkgs/applications/video/bombono/default.nix @@ -8,7 +8,7 @@ , dvdplusrwtools , enca , cdrkit -, ffmpeg +, ffmpeg_4 , gettext , gtk2 , gtkmm2 @@ -60,7 +60,7 @@ stdenv.mkDerivation rec { dvdauthor dvdplusrwtools enca - ffmpeg + ffmpeg_4 gtk2 gtkmm2 libdvdread @@ -76,7 +76,7 @@ stdenv.mkDerivation rec { # fix iso authoring install -Dt $out/share/bombono/resources/scons_authoring tools/scripts/SConsTwin.py - wrapProgram $out/bin/bombono-dvd --prefix PATH : ${lib.makeBinPath [ ffmpeg dvdauthor cdrkit ]} + wrapProgram $out/bin/bombono-dvd --prefix PATH : ${lib.makeBinPath [ ffmpeg_4 dvdauthor cdrkit ]} ''; meta = with lib; { diff --git a/pkgs/applications/video/ccextractor/default.nix b/pkgs/applications/video/ccextractor/default.nix index 3d623846347..8b2f185a55b 100644 --- a/pkgs/applications/video/ccextractor/default.nix +++ b/pkgs/applications/video/ccextractor/default.nix @@ -9,7 +9,7 @@ , makeWrapper , tesseract4 , leptonica -, ffmpeg +, ffmpeg_4 }: stdenv.mkDerivation rec { @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { buildInputs = [ zlib ] ++ lib.optional (!stdenv.isLinux) libiconv - ++ lib.optionals enableOcr [ leptonica tesseract4 ffmpeg ]; + ++ lib.optionals enableOcr [ leptonica tesseract4 ffmpeg_4 ]; cmakeFlags = [ # file RPATH_CHANGE could not write new RPATH: diff --git a/pkgs/applications/video/dvdstyler/default.nix b/pkgs/applications/video/dvdstyler/default.nix index ba0d4945385..8d7d5a6611d 100644 --- a/pkgs/applications/video/dvdstyler/default.nix +++ b/pkgs/applications/video/dvdstyler/default.nix @@ -7,7 +7,7 @@ , docbook-xsl-nons , dvdauthor , dvdplusrwtools -, ffmpeg +, ffmpeg_4 , flex , fontconfig , gettext @@ -61,7 +61,7 @@ in stdenv.mkDerivation rec { cdrtools dvdauthor dvdplusrwtools - ffmpeg + ffmpeg_4 fontconfig glib libexif diff --git a/pkgs/applications/video/mplayer/default.nix b/pkgs/applications/video/mplayer/default.nix index 6d280e71b86..e384c1f5c19 100644 --- a/pkgs/applications/video/mplayer/default.nix +++ b/pkgs/applications/video/mplayer/default.nix @@ -1,4 +1,4 @@ -{ config, lib, stdenv, fetchurl, fetchsvn, pkg-config, freetype, yasm, ffmpeg +{ config, lib, stdenv, fetchurl, fetchsvn, pkg-config, freetype, yasm, ffmpeg_4 , aalibSupport ? true, aalib , fontconfigSupport ? true, fontconfig, freefont_ttf , fribidiSupport ? true, fribidi @@ -87,7 +87,7 @@ stdenv.mkDerivation rec { depsBuildBuild = [ buildPackages.stdenv.cc ]; nativeBuildInputs = [ pkg-config yasm ]; buildInputs = with lib; - [ freetype ffmpeg ] + [ freetype ffmpeg_4 ] ++ optional aalibSupport aalib ++ optional fontconfigSupport fontconfig ++ optional fribidiSupport fribidi diff --git a/pkgs/applications/video/olive-editor/default.nix b/pkgs/applications/video/olive-editor/default.nix index 87056a1598d..68a3d556577 100644 --- a/pkgs/applications/video/olive-editor/default.nix +++ b/pkgs/applications/video/olive-editor/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub , pkg-config, which, qmake, wrapQtAppsHook -, qtmultimedia, frei0r, opencolorio_1, ffmpeg-full, CoreFoundation }: +, qtmultimedia, frei0r, opencolorio_1, ffmpeg_4, CoreFoundation }: stdenv.mkDerivation rec { pname = "olive-editor"; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - ffmpeg-full + ffmpeg_4 frei0r opencolorio_1 qtmultimedia diff --git a/pkgs/applications/video/simplescreenrecorder/default.nix b/pkgs/applications/video/simplescreenrecorder/default.nix index 7778e7c2224..cbeb325e7ce 100644 --- a/pkgs/applications/video/simplescreenrecorder/default.nix +++ b/pkgs/applications/video/simplescreenrecorder/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, mkDerivation, fetchFromGitHub, alsa-lib, ffmpeg, libjack2, libX11, libXext, libXinerama, qtx11extras +{ lib, stdenv, mkDerivation, fetchFromGitHub, alsa-lib, ffmpeg_4, libjack2, libX11, libXext, libXinerama, qtx11extras , libXfixes, libGLU, libGL, pkg-config, libpulseaudio, libv4l, qtbase, qttools, cmake, ninja }: @@ -30,7 +30,7 @@ mkDerivation rec { nativeBuildInputs = [ pkg-config cmake ninja ]; buildInputs = [ - alsa-lib ffmpeg libjack2 libX11 libXext libXfixes libXinerama libGLU libGL + alsa-lib ffmpeg_4 libjack2 libX11 libXext libXfixes libXinerama libGLU libGL libpulseaudio libv4l qtbase qttools qtx11extras ]; diff --git a/pkgs/applications/video/webcamoid/default.nix b/pkgs/applications/video/webcamoid/default.nix index b9c21b7ad7d..62954313213 100644 --- a/pkgs/applications/video/webcamoid/default.nix +++ b/pkgs/applications/video/webcamoid/default.nix @@ -1,6 +1,6 @@ { lib, fetchFromGitHub, pkg-config, libxcb, mkDerivation, cmake , qtbase, qtdeclarative, qtquickcontrols, qtquickcontrols2 -, ffmpeg-full, gst_all_1, libpulseaudio, alsa-lib, jack2 +, ffmpeg_4, gst_all_1, libpulseaudio, alsa-lib, jack2 , v4l-utils }: mkDerivation rec { pname = "webcamoid"; @@ -16,7 +16,7 @@ mkDerivation rec { buildInputs = [ libxcb qtbase qtdeclarative qtquickcontrols qtquickcontrols2 - ffmpeg-full + ffmpeg_4 gst_all_1.gstreamer gst_all_1.gst-plugins-base alsa-lib libpulseaudio jack2 v4l-utils diff --git a/pkgs/development/libraries/libextractor/default.nix b/pkgs/development/libraries/libextractor/default.nix index 3df4a8f91e3..a6f96160487 100644 --- a/pkgs/development/libraries/libextractor/default.nix +++ b/pkgs/development/libraries/libextractor/default.nix @@ -13,7 +13,7 @@ # ''; # See also <https://nixos.org/nixpkgs/manual/#sec-language-gnome>. , gtkSupport ? true, glib, gtk3 -, videoSupport ? true, ffmpeg, libmpeg2 +, videoSupport ? true, ffmpeg_4, libmpeg2 }: stdenv.mkDerivation rec { @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { ] ++ lib.optionals gstreamerSupport ([ gst_all_1.gstreamer ] ++ gstPlugins gst_all_1) ++ lib.optionals gtkSupport [ glib gtk3 ] - ++ lib.optionals videoSupport [ ffmpeg libmpeg2 ]; + ++ lib.optionals videoSupport [ ffmpeg_4 libmpeg2 ]; configureFlags = [ "--disable-ltdl-install" diff --git a/pkgs/development/libraries/libqtav/default.nix b/pkgs/development/libraries/libqtav/default.nix index 10f4b43f989..4a17bd951aa 100644 --- a/pkgs/development/libraries/libqtav/default.nix +++ b/pkgs/development/libraries/libqtav/default.nix @@ -10,7 +10,7 @@ , libX11 , libass , openal -, ffmpeg +, ffmpeg_4 , libuchardet , alsa-lib , libpulseaudio @@ -30,7 +30,7 @@ mkDerivation rec { libX11 libass openal - ffmpeg + ffmpeg_4 libuchardet alsa-lib libpulseaudio diff --git a/pkgs/development/libraries/mediastreamer/default.nix b/pkgs/development/libraries/mediastreamer/default.nix index fade17507ca..75c8017145d 100644 --- a/pkgs/development/libraries/mediastreamer/default.nix +++ b/pkgs/development/libraries/mediastreamer/default.nix @@ -2,7 +2,7 @@ , bzrtp , cmake , fetchFromGitLab -, ffmpeg +, ffmpeg_4 , glew , gsm , lib @@ -58,7 +58,7 @@ stdenv.mkDerivation rec { bzrtp ortp - ffmpeg + ffmpeg_4 glew libX11 libXext diff --git a/pkgs/development/libraries/pangolin/default.nix b/pkgs/development/libraries/pangolin/default.nix index 468da57b1a9..727f41ca344 100644 --- a/pkgs/development/libraries/pangolin/default.nix +++ b/pkgs/development/libraries/pangolin/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchFromGitHub, cmake, pkg-config, doxygen, libGL, glew -, xorg, ffmpeg, libjpeg, libpng, libtiff, eigen +, xorg, ffmpeg_4, libjpeg, libpng, libtiff, eigen , Carbon ? null, Cocoa ? null }: @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { libGL glew xorg.libX11 - ffmpeg + ffmpeg_4 libjpeg libpng libtiff diff --git a/pkgs/development/libraries/xine-lib/default.nix b/pkgs/development/libraries/xine-lib/default.nix index 263b6cd5959..837cc0d48b5 100644 --- a/pkgs/development/libraries/xine-lib/default.nix +++ b/pkgs/development/libraries/xine-lib/default.nix @@ -5,7 +5,7 @@ , aalib , alsa-lib , autoconf -, ffmpeg +, ffmpeg_4 , flac , libGL , libGLU @@ -42,12 +42,6 @@ stdenv.mkDerivation rec { url = "https://raw.githubusercontent.com/archlinux/svntogit-community/209ae10d59d29c13633b75aa327cf937f3ff0725/trunk/010-xine-lib-libcaca-0.99.beta20-fix.patch"; sha256 = "088141x1yp84y09x3s01v21yzas2bwavxz9v30z5hyq6c3syrmgr"; }) - # Fix build with ffmpeg 5.0 ; remove for xine-lib 1.2.12 - (fetchpatch { - name = "xine-lib-ffmpeg-5.0-fix.patch"; - url = "https://raw.githubusercontent.com/archlinux/svntogit-community/209ae10d59d29c13633b75aa327cf937f3ff0725/trunk/020-xine-lib-ffmpeg-5.0-fix.patch"; - sha256 = "15ff15bqxq1nqqazfbmfq6swrdjr2raxyq7hx6k0r61izhf0g8ld"; - }) ]; nativeBuildInputs = [ @@ -58,7 +52,7 @@ stdenv.mkDerivation rec { buildInputs = [ aalib alsa-lib - ffmpeg + ffmpeg_4 # xine-lib 1.2.12 should support ffmpeg_5 flac libGL libGLU diff --git a/pkgs/development/octave-modules/video/default.nix b/pkgs/development/octave-modules/video/default.nix index 57868e83f55..d814e769ec6 100644 --- a/pkgs/development/octave-modules/video/default.nix +++ b/pkgs/development/octave-modules/video/default.nix @@ -3,7 +3,7 @@ , lib , fetchurl , pkg-config -, ffmpeg +, ffmpeg_4 }: buildOctavePackage rec { @@ -20,7 +20,7 @@ buildOctavePackage rec { ]; propagatedBuildInputs = [ - ffmpeg + ffmpeg_4 ]; meta = with lib; { diff --git a/pkgs/development/python-modules/ffmpeg-python/default.nix b/pkgs/development/python-modules/ffmpeg-python/default.nix index 6f54fb16061..0fb0c68d4cb 100644 --- a/pkgs/development/python-modules/ffmpeg-python/default.nix +++ b/pkgs/development/python-modules/ffmpeg-python/default.nix @@ -1,7 +1,7 @@ { lib , buildPythonPackage , fetchFromGitHub -, ffmpeg +, ffmpeg_4 , future , pytest-mock , pytestCheckHook @@ -36,7 +36,7 @@ buildPythonPackage rec { patches = [ (substituteAll { src = ./ffmpeg-location.patch; - inherit ffmpeg; + ffmpeg = ffmpeg_4; }) ]; diff --git a/pkgs/games/hedgewars/default.nix b/pkgs/games/hedgewars/default.nix index 4c4914190ed..6674c85c332 100644 --- a/pkgs/games/hedgewars/default.nix +++ b/pkgs/games/hedgewars/default.nix @@ -1,4 +1,4 @@ -{ stdenv, SDL2_image, SDL2_ttf, SDL2_net, fpc, ghcWithPackages, ffmpeg, freeglut +{ stdenv, SDL2_image, SDL2_ttf, SDL2_net, fpc, ghcWithPackages, ffmpeg_4, freeglut , lib, fetchurl, cmake, pkg-config, lua5_1, SDL2, SDL2_mixer , zlib, libpng, libGL, libGLU, physfs , qtbase, qttools, wrapQtAppsHook @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { SDL2_ttf SDL2_net SDL2 SDL2_mixer SDL2_image fpc lua5_1 llvm # hard-requirement on aarch64, for some reason not strictly necessary on x86-64 - ffmpeg freeglut physfs + ffmpeg_4 freeglut physfs qtbase ] ++ lib.optional withServer ghc; diff --git a/pkgs/games/openrw/default.nix b/pkgs/games/openrw/default.nix index cd7d9cc1ae0..23475f8a55d 100644 --- a/pkgs/games/openrw/default.nix +++ b/pkgs/games/openrw/default.nix @@ -11,7 +11,7 @@ , openal , SDL2 , boost -, ffmpeg +, ffmpeg_4 , Cocoa , OpenAL }: @@ -35,7 +35,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ cmake ]; buildInputs = [ - sfml libGLU libGL bullet glm libmad openal SDL2 boost ffmpeg + sfml libGLU libGL bullet glm libmad openal SDL2 boost ffmpeg_4 ] ++ lib.optionals stdenv.isDarwin [ OpenAL Cocoa ]; meta = with lib; { diff --git a/pkgs/games/performous/default.nix b/pkgs/games/performous/default.nix index 7a58cc8e600..2faa90006b5 100644 --- a/pkgs/games/performous/default.nix +++ b/pkgs/games/performous/default.nix @@ -5,7 +5,7 @@ , aubio , boost , cmake -, ffmpeg +, ffmpeg_4 , gettext , git , glew @@ -58,7 +58,7 @@ stdenv.mkDerivation rec { SDL2 aubio boost - ffmpeg + ffmpeg_4 glew glibmm glm diff --git a/pkgs/games/stepmania/default.nix b/pkgs/games/stepmania/default.nix index 6cb7a23dff5..3ba39fde9c6 100644 --- a/pkgs/games/stepmania/default.nix +++ b/pkgs/games/stepmania/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchFromGitHub, cmake, nasm -, gtk2, glib, ffmpeg, alsa-lib, libmad, libogg, libvorbis +, gtk2, glib, ffmpeg_4, alsa-lib, libmad, libogg, libvorbis , glew, libpulseaudio, udev }: @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake nasm ]; buildInputs = [ - gtk2 glib ffmpeg alsa-lib libmad libogg libvorbis + gtk2 glib ffmpeg_4 alsa-lib libmad libogg libvorbis glew libpulseaudio udev ]; diff --git a/pkgs/games/ultrastardx/default.nix b/pkgs/games/ultrastardx/default.nix index 1d6f199480d..b0991af79cb 100644 --- a/pkgs/games/ultrastardx/default.nix +++ b/pkgs/games/ultrastardx/default.nix @@ -14,7 +14,7 @@ , SDL2_gfx , SDL2_mixer , SDL2_net, SDL2_ttf -, ffmpeg +, ffmpeg_4 , sqlite , zlib , libX11 @@ -26,7 +26,7 @@ let sharedLibs = [ pcre portaudio freetype SDL2 SDL2_image SDL2_gfx SDL2_mixer SDL2_net SDL2_ttf - sqlite lua zlib libX11 libGLU libGL ffmpeg + sqlite lua zlib libX11 libGLU libGL ffmpeg_4 ]; in stdenv.mkDerivation rec { @@ -48,9 +48,8 @@ in stdenv.mkDerivation rec { # ultrastardx binds to libffmpeg (and sublibs), specifying a very restrictive # upper bounds on the minor versions of .so files. - # We can assume ffmpeg won’t break any major ABI compatibility, since their - # patch version seems to always stay at 100, - # and their minor version changes quite frequently. + # We can assume ffmpeg_4 won’t break any major ABI compatibility, since it's + # effectively EOL sed \ -e 's/^ LIBAVCODEC_MAX_VERSION_MINOR.*$/ LIBAVCODEC_MAX_VERSION_MINOR = 1000;/' \ -i src/lib/ffmpeg-4.0/avcodec.pas diff --git a/pkgs/misc/screensavers/electricsheep/default.nix b/pkgs/misc/screensavers/electricsheep/default.nix index 35155559531..feef4e156e5 100644 --- a/pkgs/misc/screensavers/electricsheep/default.nix +++ b/pkgs/misc/screensavers/electricsheep/default.nix @@ -3,7 +3,7 @@ , fetchFromGitHub , autoreconfHook , wxGTK32 -, ffmpeg +, ffmpeg_4 , lua5_1 , curl , libpng @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { buildInputs = [ wxGTK32 - ffmpeg + ffmpeg_4 lua5_1 curl libpng diff --git a/pkgs/os-specific/linux/guvcview/default.nix b/pkgs/os-specific/linux/guvcview/default.nix index 43d8de62991..6e073662c4e 100644 --- a/pkgs/os-specific/linux/guvcview/default.nix +++ b/pkgs/os-specific/linux/guvcview/default.nix @@ -5,7 +5,7 @@ , pkg-config , portaudio , SDL2 -, ffmpeg +, ffmpeg_4 , udev , libusb1 , libv4l @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { buildInputs = [ SDL2 alsa-lib - ffmpeg + ffmpeg_4 libusb1 libv4l portaudio diff --git a/pkgs/servers/hydron/default.nix b/pkgs/servers/hydron/default.nix index 453557d109a..d0614dec6c1 100644 --- a/pkgs/servers/hydron/default.nix +++ b/pkgs/servers/hydron/default.nix @@ -3,7 +3,7 @@ , fetchFromGitHub , gitUpdater , pkg-config -, ffmpeg +, ffmpeg_4 }: buildGoModule rec { @@ -21,7 +21,7 @@ buildGoModule rec { proxyVendor = true; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ ffmpeg ]; + buildInputs = [ ffmpeg_4 ]; passthru.updateScript = gitUpdater { rev-prefix = "v"; diff --git a/pkgs/servers/misc/oven-media-engine/default.nix b/pkgs/servers/misc/oven-media-engine/default.nix index 42d86bedfc5..457dd4e9a51 100644 --- a/pkgs/servers/misc/oven-media-engine/default.nix +++ b/pkgs/servers/misc/oven-media-engine/default.nix @@ -7,7 +7,7 @@ , perl , openssl , zlib -, ffmpeg +, ffmpeg_4 , libvpx , libopus , libuuid @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; nativeBuildInputs = [ bc pkg-config perl ]; - buildInputs = [ openssl srt zlib ffmpeg libvpx libopus srtp jemalloc pcre2 libuuid hiredis ]; + buildInputs = [ openssl srt zlib ffmpeg_4 libvpx libopus srtp jemalloc pcre2 libuuid hiredis ]; preBuild = '' patchShebangs core/colorg++ diff --git a/pkgs/servers/tvheadend/default.nix b/pkgs/servers/tvheadend/default.nix index 75466c0ee21..573a857becd 100644 --- a/pkgs/servers/tvheadend/default.nix +++ b/pkgs/servers/tvheadend/default.nix @@ -14,7 +14,7 @@ , bzip2 , dbus , dtv-scan-tables -, ffmpeg +, ffmpeg_4 , gettext , gnutar , gzip @@ -64,7 +64,7 @@ in stdenv.mkDerivation { avahi bzip2 dbus - ffmpeg + ffmpeg_4 # depends on libav gettext gzip libiconv diff --git a/pkgs/tools/audio/acoustid-fingerprinter/default.nix b/pkgs/tools/audio/acoustid-fingerprinter/default.nix index 4fc3d957e13..21dc009e33d 100644 --- a/pkgs/tools/audio/acoustid-fingerprinter/default.nix +++ b/pkgs/tools/audio/acoustid-fingerprinter/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchpatch, cmake, pkg-config, qt4, taglib, chromaprint, ffmpeg }: +{ lib, stdenv, fetchurl, fetchpatch, cmake, pkg-config, qt4, taglib, chromaprint, ffmpeg_4 }: stdenv.mkDerivation rec { pname = "acoustid-fingerprinter"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ cmake pkg-config ]; - buildInputs = [ qt4 taglib chromaprint ffmpeg ]; + buildInputs = [ qt4 taglib chromaprint ffmpeg_4 ]; cmakeFlags = [ "-DTAGLIB_MIN_VERSION=${lib.getVersion taglib}" ]; diff --git a/pkgs/tools/audio/loudgain/default.nix b/pkgs/tools/audio/loudgain/default.nix index 9d4a9444b7f..caf1294c751 100644 --- a/pkgs/tools/audio/loudgain/default.nix +++ b/pkgs/tools/audio/loudgain/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, ffmpeg, libebur128 +{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, ffmpeg_4, libebur128 , libresample, taglib, zlib }: stdenv.mkDerivation rec { @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ cmake pkg-config ]; - buildInputs = [ ffmpeg libebur128 libresample taglib zlib ]; + buildInputs = [ ffmpeg_4 libebur128 libresample taglib zlib ]; postInstall = '' sed -e "1aPATH=$out/bin:\$PATH" -i "$out/bin/rgbpm" diff --git a/pkgs/tools/graphics/vulkan-cts/default.nix b/pkgs/tools/graphics/vulkan-cts/default.nix index 003a3c18bfb..0835540d92d 100644 --- a/pkgs/tools/graphics/vulkan-cts/default.nix +++ b/pkgs/tools/graphics/vulkan-cts/default.nix @@ -2,7 +2,7 @@ , fetchFromGitHub , fetchurl , cmake -, ffmpeg +, ffmpeg_4 , libdrm , libglvnd , libffi @@ -103,7 +103,7 @@ stdenv.mkDerivation (finalAttrs: { ''; buildInputs = [ - ffmpeg + ffmpeg_4 libdrm libffi libglvnd diff --git a/pkgs/tools/video/harvid/default.nix b/pkgs/tools/video/harvid/default.nix index 90ed6d42586..655d1ba3874 100644 --- a/pkgs/tools/video/harvid/default.nix +++ b/pkgs/tools/video/harvid/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, ffmpeg, libjpeg, libpng, pkg-config }: +{ lib, stdenv, fetchFromGitHub, fetchpatch, ffmpeg_4, libjpeg, libpng, pkg-config }: stdenv.mkDerivation rec { pname = "harvid"; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config ]; - buildInputs = [ ffmpeg libjpeg libpng ]; + buildInputs = [ ffmpeg_4 libjpeg libpng ]; makeFlags = [ "DESTDIR=$(out)" "libdir=\"/lib\"" ]; diff --git a/pkgs/tools/video/untrunc-anthwlock/default.nix b/pkgs/tools/video/untrunc-anthwlock/default.nix index c127bfe8740..33ec940aebc 100644 --- a/pkgs/tools/video/untrunc-anthwlock/default.nix +++ b/pkgs/tools/video/untrunc-anthwlock/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, ffmpeg, libui }: +{ lib, stdenv, fetchFromGitHub, ffmpeg_4, libui }: stdenv.mkDerivation { pname = "untrunc-anthwlock"; @@ -11,7 +11,7 @@ stdenv.mkDerivation { sha256 = "14i2lq68q990hnm2kkfamlsi67bcml85zl8yjsyxc5h8ncc2f3dp"; }; - buildInputs = [ ffmpeg libui ]; + buildInputs = [ ffmpeg_4 libui ]; buildPhase = '' runHook preBuild diff --git a/pkgs/tools/video/xjadeo/default.nix b/pkgs/tools/video/xjadeo/default.nix index e638278f8ba..e7c237e1698 100644 --- a/pkgs/tools/video/xjadeo/default.nix +++ b/pkgs/tools/video/xjadeo/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, autoreconfHook, fetchFromGitHub, ffmpeg, freetype, libGLU +{ lib, stdenv, autoreconfHook, fetchFromGitHub, ffmpeg_4, freetype, libGLU , libjack2, liblo, libX11, libXv, pkg-config, portmidi, xorg }: stdenv.mkDerivation rec { @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ - ffmpeg + ffmpeg_4 libjack2 libX11 xorg.libXext |