Commit f155a394 authored by jopejoe1's avatar jopejoe1
Browse files

opencv: pin to ffmpeg_7

parent 5cac837a

pkgs/by-name/ml/mlt/package.nix

+4 −4
Original line number Diff line number Diff line
@@ -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 {

pkgs/development/libraries/opencv/4.x.nix

+2 −2
Original line number Diff line number Diff line
@@ -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