diff options
| author | Et7f3 <cadeaudeelie@gmail.com> | 2023-01-05 04:18:07 +0100 |
|---|---|---|
| committer | Et7f3 <cadeaudeelie@gmail.com> | 2023-01-05 04:44:30 +0100 |
| commit | 50100d192e31e444261bb2f3ff4f54cfdbbcb788 (patch) | |
| tree | 0683de9f65e4d475f3476597baf17b642675693b | |
| parent | 699b87b8a420207446cb76034874d0a90fbbd5c2 (diff) | |
| download | nixpkgs-50100d192e31e444261bb2f3ff4f54cfdbbcb788.tar nixpkgs-50100d192e31e444261bb2f3ff4f54cfdbbcb788.tar.gz nixpkgs-50100d192e31e444261bb2f3ff4f54cfdbbcb788.tar.bz2 nixpkgs-50100d192e31e444261bb2f3ff4f54cfdbbcb788.tar.lz nixpkgs-50100d192e31e444261bb2f3ff4f54cfdbbcb788.tar.xz nixpkgs-50100d192e31e444261bb2f3ff4f54cfdbbcb788.tar.zst nixpkgs-50100d192e31e444261bb2f3ff4f54cfdbbcb788.zip | |
ocamlPackages.ffmpeg-swresample: fix build on darwin
| -rw-r--r-- | pkgs/development/ocaml-modules/ffmpeg/ffmpeg-swresample.nix | 4 | ||||
| -rw-r--r-- | pkgs/top-level/ocaml-packages.nix | 1 |
2 files changed, 4 insertions, 1 deletions
diff --git a/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-swresample.nix b/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-swresample.nix index 92011e48eab..801e00b6155 100644 --- a/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-swresample.nix +++ b/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-swresample.nix @@ -1,6 +1,8 @@ { lib, buildDunePackage, dune-configurator, pkg-config, fetchFromGitHub, callPackage , ffmpeg-base ? callPackage ./base.nix { } , ffmpeg-avutil, ffmpeg-avcodec, ffmpeg +, stdenv +, VideoToolbox }: buildDunePackage { @@ -11,7 +13,7 @@ buildDunePackage { inherit (ffmpeg-base) version src useDune2; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ dune-configurator ]; + buildInputs = [ dune-configurator ] ++ lib.optionals stdenv.isDarwin [ VideoToolbox ]; propagatedBuildInputs = [ ffmpeg-avutil ffmpeg-avcodec ffmpeg.dev ]; doCheck = true; diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index d6cb2d2d80f..2488dc579c4 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -466,6 +466,7 @@ let }; ffmpeg-swresample = callPackage ../development/ocaml-modules/ffmpeg/ffmpeg-swresample.nix { inherit (pkgs) ffmpeg; + inherit (pkgs.darwin.apple_sdk.frameworks) VideoToolbox; }; ffmpeg-av = callPackage ../development/ocaml-modules/ffmpeg/ffmpeg-av.nix { inherit (pkgs) ffmpeg; |