Unverified Commit d66c3f7c authored by superherointj's avatar superherointj Committed by GitHub
Browse files

Merge pull request #220603 from anmonteiro/anmonteiro/fix-ffmpeg-avdevice-macos 

ocamlPackages.ffmpeg-avdevice: add missing AVFoundation library on macOS
parents 5a273e3b a48e7da5

pkgs/development/ocaml-modules/ffmpeg/ffmpeg-avdevice.nix

+12 −1
Original line number Diff line number Diff line 
{ 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;

pkgs/top-level/ocaml-packages.nix

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