diff options
| author | Et7f3 <cadeaudeelie@gmail.com> | 2023-01-03 02:03:17 +0100 |
|---|---|---|
| committer | Et7f3 <cadeaudeelie@gmail.com> | 2023-01-05 04:44:27 +0100 |
| commit | 9a5b1e495fdd63232c1469a4f982c3e86f6ce39f (patch) | |
| tree | 93959cba59b0ce08276588005508646d4e8559f4 | |
| parent | 5c304acd4332e5e582572e1ef12947a563a91877 (diff) | |
ocamlPackages.ffmpeg-avutil: fix build on darwin
| -rw-r--r-- | pkgs/development/ocaml-modules/ffmpeg/ffmpeg-avutil.nix | 5 | ||||
| -rw-r--r-- | pkgs/top-level/ocaml-packages.nix | 1 |
2 files changed, 4 insertions, 2 deletions
diff --git a/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-avutil.nix b/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-avutil.nix index 121fb115146ef..7635fb6d1218a 100644 --- a/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-avutil.nix +++ b/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-avutil.nix @@ -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; diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 5e6ec1a742d32..1e91050020a24 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -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; |