opencv: pin to ffmpeg_7

This commit is contained in:
jopejoe1
2025-10-09 22:52:31 +02:00
parent 5cac837a94
commit f155a3942c
2 changed files with 6 additions and 6 deletions
+4 -4
View File
@@ -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 {
+2 -2
View File
@@ -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