From cbc1884cdc24a33a7c92724d435a38ffa588e22d Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Wed, 19 Apr 2023 11:55:41 +0300 Subject: [PATCH] ocamlPackages.lablgl: unbreak on darwin --- pkgs/development/ocaml-modules/lablgl/default.nix | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/pkgs/development/ocaml-modules/lablgl/default.nix b/pkgs/development/ocaml-modules/lablgl/default.nix index 55dd88d7246..cb885b7b069 100644 --- a/pkgs/development/ocaml-modules/lablgl/default.nix +++ b/pkgs/development/ocaml-modules/lablgl/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, ocaml, findlib, libGLU, libGL, freeglut } : +{ lib, stdenv, fetchFromGitHub, ocaml, findlib, libGLU, libGL, freeglut, darwin } : if lib.versionOlder ocaml.version "4.03" then throw "lablgl is not available for OCaml ${ocaml.version}" @@ -19,7 +19,13 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ ocaml findlib ]; buildInputs = [ freeglut ]; - propagatedBuildInputs = [ libGLU libGL ]; + propagatedBuildInputs = [ + libGLU + libGL + ] ++ lib.optionals stdenv.isDarwin [ + darwin.apple_sdk.frameworks.GLUT + darwin.apple_sdk.libs.Xplugin + ]; patches = [ ./Makefile.config.patch ./META.patch ]; @@ -46,6 +52,5 @@ stdenv.mkDerivation rec { license = licenses.gpl2; maintainers = with maintainers; [ pSub vbgl ]; mainProgram = "lablglut"; - broken = stdenv.isDarwin; }; }