From 56a2098698688a02f8be6a43f52570afa5fcda89 Mon Sep 17 00:00:00 2001 From: Emily Date: Sun, 8 Sep 2024 01:24:35 +0100 Subject: [PATCH] ocamlPackages.ffmpeg*: pin FFmpeg 6 for now --- pkgs/top-level/ocaml-packages.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index c487541fa2e8..65574e91e1bd 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -510,31 +510,31 @@ let ffmpeg = callPackage ../development/ocaml-modules/ffmpeg { }; ffmpeg-av = callPackage ../development/ocaml-modules/ffmpeg/ffmpeg-av.nix { - inherit (pkgs) ffmpeg; + ffmpeg = pkgs.ffmpeg_6; inherit (pkgs.darwin.apple_sdk.frameworks) AudioToolbox VideoToolbox; }; ffmpeg-avcodec = callPackage ../development/ocaml-modules/ffmpeg/ffmpeg-avcodec.nix { - inherit (pkgs) ffmpeg; + ffmpeg = pkgs.ffmpeg_6; inherit (pkgs.darwin.apple_sdk.frameworks) AudioToolbox VideoToolbox; }; ffmpeg-avdevice = callPackage ../development/ocaml-modules/ffmpeg/ffmpeg-avdevice.nix { - inherit (pkgs) ffmpeg; + ffmpeg = pkgs.ffmpeg_6; inherit (pkgs.darwin.apple_sdk.frameworks) AppKit AudioToolbox AVFoundation Cocoa CoreImage ForceFeedback OpenGL VideoToolbox; }; ffmpeg-avfilter = callPackage ../development/ocaml-modules/ffmpeg/ffmpeg-avfilter.nix { - inherit (pkgs) ffmpeg; + ffmpeg = pkgs.ffmpeg_6; inherit (pkgs.darwin.apple_sdk.frameworks) AppKit CoreImage OpenGL VideoToolbox; }; ffmpeg-avutil = callPackage ../development/ocaml-modules/ffmpeg/ffmpeg-avutil.nix { - inherit (pkgs) ffmpeg; + ffmpeg = pkgs.ffmpeg_6; inherit (pkgs.darwin.apple_sdk.frameworks) AudioToolbox VideoToolbox; }; ffmpeg-swresample = callPackage ../development/ocaml-modules/ffmpeg/ffmpeg-swresample.nix { - inherit (pkgs) ffmpeg; + ffmpeg = pkgs.ffmpeg_6; inherit (pkgs.darwin.apple_sdk.frameworks) VideoToolbox; }; ffmpeg-swscale = callPackage ../development/ocaml-modules/ffmpeg/ffmpeg-swscale.nix { - inherit (pkgs) ffmpeg; + ffmpeg = pkgs.ffmpeg_6; inherit (pkgs.darwin.apple_sdk.frameworks) VideoToolbox; };