mirror of
https://github.com/SebastianWendel/nixpkgs.git
synced 2024-09-20 12:29:02 +02:00
ocamlPackages.ffmpeg-swresample: fix build on darwin
This commit is contained in:
parent
699b87b8a4
commit
50100d192e
|
@ -1,6 +1,8 @@
|
||||||
{ lib, buildDunePackage, dune-configurator, pkg-config, fetchFromGitHub, callPackage
|
{ lib, buildDunePackage, dune-configurator, pkg-config, fetchFromGitHub, callPackage
|
||||||
, ffmpeg-base ? callPackage ./base.nix { }
|
, ffmpeg-base ? callPackage ./base.nix { }
|
||||||
, ffmpeg-avutil, ffmpeg-avcodec, ffmpeg
|
, ffmpeg-avutil, ffmpeg-avcodec, ffmpeg
|
||||||
|
, stdenv
|
||||||
|
, VideoToolbox
|
||||||
}:
|
}:
|
||||||
|
|
||||||
buildDunePackage {
|
buildDunePackage {
|
||||||
|
@ -11,7 +13,7 @@ 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 [ VideoToolbox ];
|
||||||
propagatedBuildInputs = [ ffmpeg-avutil ffmpeg-avcodec ffmpeg.dev ];
|
propagatedBuildInputs = [ ffmpeg-avutil ffmpeg-avcodec ffmpeg.dev ];
|
||||||
|
|
||||||
doCheck = true;
|
doCheck = true;
|
||||||
|
|
|
@ -466,6 +466,7 @@ let
|
||||||
};
|
};
|
||||||
ffmpeg-swresample = callPackage ../development/ocaml-modules/ffmpeg/ffmpeg-swresample.nix {
|
ffmpeg-swresample = callPackage ../development/ocaml-modules/ffmpeg/ffmpeg-swresample.nix {
|
||||||
inherit (pkgs) ffmpeg;
|
inherit (pkgs) ffmpeg;
|
||||||
|
inherit (pkgs.darwin.apple_sdk.frameworks) VideoToolbox;
|
||||||
};
|
};
|
||||||
ffmpeg-av = callPackage ../development/ocaml-modules/ffmpeg/ffmpeg-av.nix {
|
ffmpeg-av = callPackage ../development/ocaml-modules/ffmpeg/ffmpeg-av.nix {
|
||||||
inherit (pkgs) ffmpeg;
|
inherit (pkgs) ffmpeg;
|
||||||
|
|
Loading…
Reference in a new issue