From a48e7da55a2f5b1e1969250e12926f4994e0e2ca Mon Sep 17 00:00:00 2001 From: Antonio Nuno Monteiro Date: Fri, 10 Mar 2023 21:10:14 -0800 Subject: [PATCH] ocamlPackages.ffmpeg-avdevice: add missing AVFoundation library on macOS --- .../ocaml-modules/ffmpeg/ffmpeg-avdevice.nix | 13 ++++++++++++- pkgs/top-level/ocaml-packages.nix | 2 +- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-avdevice.nix b/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-avdevice.nix index 64ebc1affee1..b2537bd25be3 100644 --- a/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-avdevice.nix +++ b/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-avdevice.nix @@ -1,6 +1,7 @@ { lib, buildDunePackage, dune-configurator, pkg-config, fetchFromGitHub, callPackage , AppKit , AudioToolbox +, AVFoundation , Cocoa , CoreImage , ForceFeedback @@ -20,7 +21,17 @@ buildDunePackage { nativeBuildInputs = [ pkg-config ]; buildInputs = [ dune-configurator ] - ++ lib.optionals stdenv.isDarwin [ AppKit AudioToolbox Cocoa CoreImage ForceFeedback OpenGL VideoToolbox ]; + ++ lib.optionals stdenv.isDarwin [ + AppKit + AudioToolbox + AVFoundation + Cocoa + CoreImage + ForceFeedback + OpenGL + VideoToolbox + ]; + propagatedBuildInputs = [ ffmpeg-av ffmpeg.dev ]; doCheck = true; diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index e22f41a63cd2..ac8af28fbcc8 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -483,7 +483,7 @@ let }; ffmpeg-avdevice = callPackage ../development/ocaml-modules/ffmpeg/ffmpeg-avdevice.nix { inherit (pkgs) ffmpeg; - inherit (pkgs.darwin.apple_sdk.frameworks) AppKit AudioToolbox Cocoa CoreImage ForceFeedback OpenGL VideoToolbox; + inherit (pkgs.darwin.apple_sdk.frameworks) AppKit AudioToolbox AVFoundation Cocoa CoreImage ForceFeedback OpenGL VideoToolbox; }; fiber = callPackage ../development/ocaml-modules/fiber { };