diff --git a/pkgs/development/ocaml-modules/bjack/default.nix b/pkgs/development/ocaml-modules/bjack/default.nix index fa03194bde4a..a102d27c2879 100644 --- a/pkgs/development/ocaml-modules/bjack/default.nix +++ b/pkgs/development/ocaml-modules/bjack/default.nix @@ -1,4 +1,4 @@ -{ lib, buildDunePackage, fetchFromGitHub, dune-configurator, libsamplerate, libjack2 }: +{ lib, stdenv, buildDunePackage, fetchFromGitHub, Accelerate, CoreAudio, dune-configurator, libsamplerate, libjack2 }: buildDunePackage rec { pname = "bjack"; @@ -13,7 +13,7 @@ buildDunePackage rec { sha256 = "1gf31a8i9byp6npn0x6gydcickn6sf5dnzmqr2c1b9jn2nl7334c"; }; - buildInputs = [ dune-configurator ]; + buildInputs = [ dune-configurator ] ++ lib.optionals stdenv.isDarwin [ Accelerate CoreAudio ]; propagatedBuildInputs = [ libsamplerate libjack2 ]; meta = with lib; { diff --git a/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-av.nix b/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-av.nix index e8d71aa321e0..8c4d4e8c23c4 100644 --- a/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-av.nix +++ b/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-av.nix @@ -1,6 +1,10 @@ { lib, buildDunePackage, dune-configurator, pkg-config, fetchFromGitHub, callPackage +, AudioToolbox , ffmpeg-base ? callPackage ./base.nix { } -, ffmpeg-avutil, ffmpeg-avcodec, ffmpeg }: +, ffmpeg-avutil, ffmpeg-avcodec, ffmpeg +, stdenv +, VideoToolbox +}: buildDunePackage { pname = "ffmpeg-av"; @@ -10,7 +14,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-avutil ffmpeg-avcodec ffmpeg.dev ]; doCheck = true; diff --git a/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-avcodec.nix b/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-avcodec.nix index 8ee5428c473e..442c80ab6a12 100644 --- a/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-avcodec.nix +++ b/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-avcodec.nix @@ -1,6 +1,9 @@ { lib, buildDunePackage, dune-configurator, pkg-config, fetchFromGitHub, callPackage +, AudioToolbox , ffmpeg-base ? callPackage ./base.nix { } , ffmpeg-avutil, ffmpeg +, stdenv +, VideoToolbox }: buildDunePackage { @@ -11,7 +14,8 @@ buildDunePackage { inherit (ffmpeg-base) version src useDune2; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ dune-configurator ]; + buildInputs = [ dune-configurator ] + ++ lib.optionals stdenv.isDarwin [ AudioToolbox VideoToolbox ]; propagatedBuildInputs = [ ffmpeg-avutil ffmpeg.dev ]; doCheck = true; diff --git a/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-avdevice.nix b/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-avdevice.nix index e6641a6ca030..72180afb9614 100644 --- a/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-avdevice.nix +++ b/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-avdevice.nix @@ -1,6 +1,14 @@ { lib, buildDunePackage, dune-configurator, pkg-config, fetchFromGitHub, callPackage +, AppKit +, AudioToolbox +, Cocoa +, CoreImage +, ForceFeedback , ffmpeg-base ? callPackage ./base.nix { } , ffmpeg-av, ffmpeg +, OpenGL +, stdenv +, VideoToolbox }: buildDunePackage { @@ -11,7 +19,8 @@ buildDunePackage { inherit (ffmpeg-base) version src useDune2; 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 ]; doCheck = true; diff --git a/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-avfilter.nix b/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-avfilter.nix index 6479bbe55bf6..3b3b94988b17 100644 --- a/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-avfilter.nix +++ b/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-avfilter.nix @@ -1,6 +1,11 @@ { lib, buildDunePackage, dune-configurator, pkg-config, fetchFromGitHub, callPackage +, AppKit +, CoreImage , ffmpeg-base ? callPackage ./base.nix { } , ffmpeg-avutil, ffmpeg +, OpenGL +, stdenv +, VideoToolbox }: buildDunePackage { @@ -11,7 +16,8 @@ buildDunePackage { inherit (ffmpeg-base) version src useDune2; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ dune-configurator ]; + buildInputs = [ dune-configurator ] + ++ lib.optionals stdenv.isDarwin [ AppKit CoreImage OpenGL VideoToolbox ]; propagatedBuildInputs = [ ffmpeg-avutil ffmpeg.dev ]; doCheck = true; diff --git a/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-avutil.nix b/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-avutil.nix index 121fb115146e..7635fb6d1218 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/development/ocaml-modules/ffmpeg/ffmpeg-swresample.nix b/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-swresample.nix index 92011e48eab6..801e00b6155f 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/development/ocaml-modules/ffmpeg/ffmpeg-swscale.nix b/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-swscale.nix index 9d97b722551b..f39ffbc96fa0 100644 --- a/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-swscale.nix +++ b/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-swscale.nix @@ -1,6 +1,8 @@ { lib, buildDunePackage, dune-configurator, pkg-config, fetchFromGitHub, callPackage , ffmpeg-base ? callPackage ./base.nix { } , ffmpeg-avutil, 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.dev ]; doCheck = true; diff --git a/pkgs/development/ocaml-modules/gstreamer/default.nix b/pkgs/development/ocaml-modules/gstreamer/default.nix index 4ef3e98cb75e..34407299914a 100644 --- a/pkgs/development/ocaml-modules/gstreamer/default.nix +++ b/pkgs/development/ocaml-modules/gstreamer/default.nix @@ -1,4 +1,4 @@ -{ lib, buildDunePackage, fetchFromGitHub, dune-configurator, pkg-config, glib, gst_all_1 }: +{ lib, stdenv, buildDunePackage, fetchFromGitHub, dune-configurator, AppKit, Foundation, pkg-config, glib, gst_all_1 }: buildDunePackage rec { pname = "gstreamer"; @@ -12,7 +12,7 @@ buildDunePackage rec { }; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ dune-configurator ]; + buildInputs = [ dune-configurator ] ++ lib.optionals stdenv.isDarwin [ AppKit Foundation ]; propagatedBuildInputs = [ glib.dev gst_all_1.gstreamer.dev gst_all_1.gst-plugins-base ]; CFLAGS_COMPILE = [ diff --git a/pkgs/development/ocaml-modules/labltk/default.nix b/pkgs/development/ocaml-modules/labltk/default.nix index fd7e59424547..4d5c4ae303e8 100644 --- a/pkgs/development/ocaml-modules/labltk/default.nix +++ b/pkgs/development/ocaml-modules/labltk/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, makeWrapper, fetchzip, ocaml, findlib, tcl, tk }: +{ stdenv, lib, makeWrapper, fetchzip, Cocoa, ocaml, findlib, tcl, tk }: let params = @@ -60,7 +60,7 @@ stdenv.mkDerivation rec { pname = "ocaml${ocaml.version}-labltk"; nativeBuildInputs = [ ocaml findlib makeWrapper ]; - buildInputs = [ tcl tk ]; + buildInputs = [ tcl tk ] ++ lib.optionals stdenv.isDarwin [ Cocoa ]; configureFlags = [ "--use-findlib" "--installbindir" "$(out)/bin" ]; dontAddPrefix = true; diff --git a/pkgs/development/ocaml-modules/ocaml-libvirt/default.nix b/pkgs/development/ocaml-modules/ocaml-libvirt/default.nix index c321ca2bcb47..67741516af19 100644 --- a/pkgs/development/ocaml-modules/ocaml-libvirt/default.nix +++ b/pkgs/development/ocaml-modules/ocaml-libvirt/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitLab, libvirt, autoreconfHook, pkg-config, ocaml, findlib, perl }: +{ lib, stdenv, fetchFromGitLab, libvirt, AppKit, Foundation, autoreconfHook, pkg-config, ocaml, findlib, perl }: lib.throwIfNot (lib.versionAtLeast ocaml.version "4.02") "libvirt is not available for OCaml ${ocaml.version}" @@ -18,6 +18,11 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook pkg-config findlib perl ocaml ]; + buildInputs = lib.optionals stdenv.isDarwin [ + Foundation + AppKit + ]; + strictDeps = true; buildFlags = [ "all" "opt" "CPPFLAGS=-Wno-error" ]; diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index ee3b3ad21a1a..f037f5b7cc9d 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -86,7 +86,9 @@ let bitv = callPackage ../development/ocaml-modules/bitv { }; - bjack = callPackage ../development/ocaml-modules/bjack { }; + bjack = callPackage ../development/ocaml-modules/bjack { + inherit (pkgs.darwin.apple_sdk.frameworks) Accelerate CoreAudio; + }; bls12-381 = callPackage ../development/ocaml-modules/bls12-381 { }; bls12-381-gen = callPackage ../development/ocaml-modules/bls12-381/gen.nix { }; @@ -450,24 +452,31 @@ 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; + inherit (pkgs.darwin.apple_sdk.frameworks) AudioToolbox VideoToolbox; }; ffmpeg-avfilter = callPackage ../development/ocaml-modules/ffmpeg/ffmpeg-avfilter.nix { inherit (pkgs) ffmpeg; + inherit (pkgs.darwin.apple_sdk.frameworks) AppKit CoreImage OpenGL VideoToolbox; }; ffmpeg-swscale = callPackage ../development/ocaml-modules/ffmpeg/ffmpeg-swscale.nix { inherit (pkgs) ffmpeg; + inherit (pkgs.darwin.apple_sdk.frameworks) VideoToolbox; }; 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; + inherit (pkgs.darwin.apple_sdk.frameworks) AudioToolbox VideoToolbox; }; ffmpeg-avdevice = callPackage ../development/ocaml-modules/ffmpeg/ffmpeg-avdevice.nix { inherit (pkgs) ffmpeg; + inherit (pkgs.darwin.apple_sdk.frameworks) AppKit AudioToolbox Cocoa CoreImage ForceFeedback OpenGL VideoToolbox; }; fiber = callPackage ../development/ocaml-modules/fiber { }; @@ -524,7 +533,9 @@ let inherit (pkgs) gsl; }; - gstreamer = callPackage ../development/ocaml-modules/gstreamer { }; + gstreamer = callPackage ../development/ocaml-modules/gstreamer { + inherit (pkgs.darwin.apple_sdk.frameworks) AppKit Foundation; + }; h2 = callPackage ../development/ocaml-modules/h2 { }; @@ -707,7 +718,9 @@ let then callPackage ../development/ocaml-modules/lablgtk-extras { } else callPackage ../development/ocaml-modules/lablgtk-extras/1.4.nix { }; - labltk = callPackage ../development/ocaml-modules/labltk { }; + labltk = callPackage ../development/ocaml-modules/labltk { + inherit (pkgs.darwin.apple_sdk.frameworks) Cocoa; + }; lacaml = callPackage ../development/ocaml-modules/lacaml { }; @@ -1000,7 +1013,9 @@ let ocamlgraph = callPackage ../development/ocaml-modules/ocamlgraph { }; ocamlgraph_gtk = callPackage ../development/ocaml-modules/ocamlgraph/gtk.nix { }; - ocaml_libvirt = callPackage ../development/ocaml-modules/ocaml-libvirt { }; + ocaml_libvirt = callPackage ../development/ocaml-modules/ocaml-libvirt { + inherit (pkgs.darwin.apple_sdk.frameworks) Foundation AppKit; + }; ocamlify = callPackage ../development/tools/ocaml/ocamlify { };