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

ocamlPackages.ffmpeg-avdevice: fix build on darwin

Browse Source
This commit is contained in:
Et7f3 2023-01-05 04:14:30 +01:00
parent 278da9f093
commit 699b87b8a4
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,6 +1,14 @@
{ lib, buildDunePackage, dune-configurator, pkg-config, fetchFromGitHub, callPackage { lib, buildDunePackage, dune-configurator, pkg-config, fetchFromGitHub, callPackage
, AppKit
, AudioToolbox
, Cocoa
, CoreImage
, ForceFeedback
, ffmpeg-base ? callPackage ./base.nix { } , ffmpeg-base ? callPackage ./base.nix { }
, ffmpeg-av, ffmpeg , ffmpeg-av, ffmpeg
, OpenGL
, stdenv
, VideoToolbox
}: }:
buildDunePackage { buildDunePackage {
@ -11,7 +19,8 @@ buildDunePackage {
inherit (ffmpeg-base) version src useDune2; inherit (ffmpeg-base) version src useDune2;
nativeBuildInputs = [ pkg-config ]; nativeBuildInputs = [ pkg-config ];
buildInputs = [ dune-configurator ]; buildInputs = [ dune-configurator ]
++ lib.optionals stdenv.isDarwin [ AppKit AudioToolbox Cocoa CoreImage ForceFeedback OpenGL VideoToolbox ];
propagatedBuildInputs = [ ffmpeg-av ffmpeg.dev ]; propagatedBuildInputs = [ ffmpeg-av ffmpeg.dev ];
doCheck = true; doCheck = true;

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

@ -473,6 +473,7 @@ let
}; };
ffmpeg-avdevice = callPackage ../development/ocaml-modules/ffmpeg/ffmpeg-avdevice.nix { ffmpeg-avdevice = callPackage ../development/ocaml-modules/ffmpeg/ffmpeg-avdevice.nix {
inherit (pkgs) ffmpeg; inherit (pkgs) ffmpeg;
inherit (pkgs.darwin.apple_sdk.frameworks) AppKit AudioToolbox Cocoa CoreImage ForceFeedback OpenGL VideoToolbox;
}; };
fiber = callPackage ../development/ocaml-modules/fiber { }; fiber = callPackage ../development/ocaml-modules/fiber { };