From 6308679d28886b8c0d0377b4227a012ca4ca6fdc Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Sun, 6 Feb 2022 13:37:26 -0600 Subject: [PATCH] ocamlPackages.cairo2: fix build on aarch64-darwin --- pkgs/development/ocaml-modules/cairo2/default.nix | 5 +++-- pkgs/top-level/ocaml-packages.nix | 4 +++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/development/ocaml-modules/cairo2/default.nix b/pkgs/development/ocaml-modules/cairo2/default.nix index 0a9922f6788..1801a0679b5 100644 --- a/pkgs/development/ocaml-modules/cairo2/default.nix +++ b/pkgs/development/ocaml-modules/cairo2/default.nix @@ -1,4 +1,5 @@ -{ stdenv, lib, fetchurl, buildDunePackage, ocaml, dune-configurator, pkg-config, cairo }: +{ stdenv, lib, fetchurl, buildDunePackage, ocaml, dune-configurator, pkg-config, cairo +, ApplicationServices }: buildDunePackage rec { pname = "cairo2"; @@ -13,7 +14,7 @@ buildDunePackage rec { useDune2 = true; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ cairo dune-configurator ]; + buildInputs = [ cairo dune-configurator ] ++ lib.optionals stdenv.isDarwin [ ApplicationServices ]; doCheck = !(stdenv.isDarwin # https://github.com/Chris00/ocaml-cairo/issues/19 diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index ee3159c50d9..a29602dfb7d 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -140,7 +140,9 @@ let ocaml_cairo = callPackage ../development/ocaml-modules/ocaml-cairo { }; - cairo2 = callPackage ../development/ocaml-modules/cairo2 { }; + cairo2 = callPackage ../development/ocaml-modules/cairo2 { + inherit (pkgs.darwin.apple_sdk.frameworks) ApplicationServices; + }; callipyge = callPackage ../development/ocaml-modules/callipyge { };