diff options
| author | Weijia Wang <9713184+wegank@users.noreply.github.com> | 2023-04-20 10:17:15 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-04-20 10:17:15 +0300 |
| commit | 7ea26cf75377d5635cd2f481d64695bf878e8210 (patch) | |
| tree | ae98b6f3a4fc59b423e3ae4190e21d03613101b8 | |
| parent | 17148b8f7d38afc105cf88d983d9b3ba1cd96997 (diff) | |
| parent | c2c0c070cf1c51a9b4865a7e6875519cc124ed35 (diff) | |
Merge pull request #227027 from wegank/lablgl-fix
ocamlPackages.lablgl: unbreak on darwin
| -rw-r--r-- | pkgs/applications/science/math/glsurf/default.nix | 1 | ||||
| -rw-r--r-- | pkgs/development/ocaml-modules/lablgl/default.nix | 11 |
2 files changed, 9 insertions, 3 deletions
diff --git a/pkgs/applications/science/math/glsurf/default.nix b/pkgs/applications/science/math/glsurf/default.nix index ec3bb4c795b32..b4e8c6fb23db0 100644 --- a/pkgs/applications/science/math/glsurf/default.nix +++ b/pkgs/applications/science/math/glsurf/default.nix @@ -67,5 +67,6 @@ stdenv.mkDerivation rec { homepage = "https://raffalli.eu/~christophe/glsurf/"; description = "A program to draw implicit surfaces and curves"; license = lib.licenses.gpl2Plus; + platforms = lib.platforms.all; }; } diff --git a/pkgs/development/ocaml-modules/lablgl/default.nix b/pkgs/development/ocaml-modules/lablgl/default.nix index 55dd88d7246b8..cb885b7b069c7 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; }; } |