diff options
| author | Et7f3 <cadeaudeelie@gmail.com> | 2023-01-03 01:06:14 +0100 |
|---|---|---|
| committer | Et7f3 <cadeaudeelie@gmail.com> | 2023-01-05 04:44:25 +0100 |
| commit | 0a29695c1f488e7d1932baa572625bf668e975aa (patch) | |
| tree | 3b9fefb4972c5fb0c62867aaf7809ae5a24dade1 | |
| parent | dea24b6610be436e65df7fc54ac9ad56c63d3209 (diff) | |
| download | nixpkgs-0a29695c1f488e7d1932baa572625bf668e975aa.tar nixpkgs-0a29695c1f488e7d1932baa572625bf668e975aa.tar.gz nixpkgs-0a29695c1f488e7d1932baa572625bf668e975aa.tar.bz2 nixpkgs-0a29695c1f488e7d1932baa572625bf668e975aa.tar.lz nixpkgs-0a29695c1f488e7d1932baa572625bf668e975aa.tar.xz nixpkgs-0a29695c1f488e7d1932baa572625bf668e975aa.tar.zst nixpkgs-0a29695c1f488e7d1932baa572625bf668e975aa.zip | |
ocamlPackages.labltk: fix build on darwin
| -rw-r--r-- | pkgs/development/ocaml-modules/labltk/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/top-level/ocaml-packages.nix | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/pkgs/development/ocaml-modules/labltk/default.nix b/pkgs/development/ocaml-modules/labltk/default.nix index fd7e5942454..4d5c4ae303e 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/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 09947eb4bbb..f2816f20cba 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -703,7 +703,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 { }; |