dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

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

Browse Source 
ocamlPackages.ffmpeg-avdevice: add missing AVFoundation library on macOS
This commit is contained in:
superherointj 2023-03-11 06:45:51 -03:00 committed by GitHub
commit d66c3f7c86
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
pkgs/development/ocaml-modules/ffmpeg/ffmpeg-avdevice.nix
View File

@ -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;

2
pkgs/top-level/ocaml-packages.nix
View File

@ -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 { };