diff options
author | Atemu <atemu.main@gmail.com> | 2023-03-03 19:41:10 +0100 |
---|---|---|
committer | Fabián Heredia Montiel <fabianhjr@protonmail.com> | 2023-03-13 16:42:22 -0600 |
commit | 9bd2506458ea053ccbcde6e622d7cec9993d8f36 (patch) | |
tree | 7008491e4fcfb755a2cd2dc49465c94cd5a4c282 /pkgs/applications/video | |
parent | 711e9cfd493296681b84147a650972ea78e948c4 (diff) |
treewide: make ffmpeg_4-dependant packages depend on ffmpeg_4
These packages were identified as broken when ffmpeg = ffmpeg_5. Tested _only_ by building them. If you are a maintainer of one of these packages, please test whether your package still works.
Diffstat (limited to 'pkgs/applications/video')
-rw-r--r-- | pkgs/applications/video/bino3d/default.nix | 4 | ||||
-rw-r--r-- | pkgs/applications/video/bombono/default.nix | 6 | ||||
-rw-r--r-- | pkgs/applications/video/ccextractor/default.nix | 4 | ||||
-rw-r--r-- | pkgs/applications/video/dvdstyler/default.nix | 4 | ||||
-rw-r--r-- | pkgs/applications/video/mplayer/default.nix | 4 | ||||
-rw-r--r-- | pkgs/applications/video/olive-editor/default.nix | 4 | ||||
-rw-r--r-- | pkgs/applications/video/simplescreenrecorder/default.nix | 4 | ||||
-rw-r--r-- | pkgs/applications/video/webcamoid/default.nix | 4 |
8 files changed, 17 insertions, 17 deletions
diff --git a/pkgs/applications/video/bino3d/default.nix b/pkgs/applications/video/bino3d/default.nix index b1f5a693de426..d15d649b841b5 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 e39d09b6fe720..3990aeb662f12 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 3d62384634707..8b2f185a55bd7 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 ba0d4945385e6..8d7d5a6611d34 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 6d280e71b8610..e384c1f5c1944 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 87056a1598d72..68a3d5565774f 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 7778e7c222408..cbeb325e7ce09 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 b9c21b7ad7d17..62954313213cd 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 |