b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

ocamlPackages.ffmpeg-avutil: fix build on darwin

Browse source
This commit is contained in:
Et7f3 2023-01-03 02:03:17 +01:00
parent 5c304acd43
commit 9a5b1e495f
2 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
pkgs/development/ocaml-modules/ffmpeg/ffmpeg-avutil.nix
View file

@ -1,4 +1,5 @@
{ lib, buildDunePackage, dune-configurator, pkg-config, fetchFromGitHub, callPackage
{ lib, stdenv, buildDunePackage, dune-configurator, pkg-config, fetchFromGitHub, callPackage
, AudioToolbox, VideoToolbox
, ffmpeg-base ? callPackage ./base.nix { }
, ffmpeg
}:
@ -11,7 +12,7 @@ buildDunePackage {
inherit (ffmpeg-base) version src useDune2;
nativeBuildInputs = [ pkg-config ];
buildInputs = [ dune-configurator ];
buildInputs = [ dune-configurator ] ++ lib.optionals stdenv.isDarwin [ AudioToolbox VideoToolbox ];
propagatedBuildInputs = [ ffmpeg.dev ];
doCheck = true;

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

@ -448,6 +448,7 @@ let
ffmpeg = callPackage ../development/ocaml-modules/ffmpeg { };
ffmpeg-avutil = callPackage ../development/ocaml-modules/ffmpeg/ffmpeg-avutil.nix {
inherit (pkgs) ffmpeg;
inherit (pkgs.darwin.apple_sdk.frameworks) AudioToolbox VideoToolbox;
};
ffmpeg-avcodec = callPackage ../development/ocaml-modules/ffmpeg/ffmpeg-avcodec.nix {
inherit (pkgs) ffmpeg;