diff --git a/pkgs/by-name/ml/mlt/package.nix b/pkgs/by-name/ml/mlt/package.nix index 41e7af71554e..ae965a28077c 100644 --- a/pkgs/by-name/ml/mlt/package.nix +++ b/pkgs/by-name/ml/mlt/package.nix @@ -6,7 +6,7 @@ cmake, pkg-config, which, - ffmpeg, + ffmpeg_7, fftw, frei0r, libdv, @@ -71,8 +71,8 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - (opencv4.override { inherit ffmpeg; }) - ffmpeg + (opencv4.override { inherit ffmpeg_7; }) + ffmpeg_7 fftw frei0r libdv @@ -137,7 +137,7 @@ stdenv.mkDerivation rec { ''; passthru = { - inherit ffmpeg; + ffmpeg = ffmpeg_7; }; passthru.updateScript = gitUpdater { diff --git a/pkgs/development/libraries/opencv/4.x.nix b/pkgs/development/libraries/opencv/4.x.nix index 532513e1fe42..93f093e316d6 100644 --- a/pkgs/development/libraries/opencv/4.x.nix +++ b/pkgs/development/libraries/opencv/4.x.nix @@ -58,7 +58,7 @@ enableVtk ? false, vtk, enableFfmpeg ? true, - ffmpeg, + ffmpeg_7, enableGStreamer ? true, elfutils, gst_all_1, @@ -369,7 +369,7 @@ effectiveStdenv.mkDerivation { openjpeg ] ++ optionals enableFfmpeg [ - ffmpeg + ffmpeg_7 ] ++ optionals (enableGStreamer && effectiveStdenv.hostPlatform.isLinux) [ elfutils