lol

Merge pull request #227027 from wegank/lablgl-fix

ocamlPackages.lablgl: unbreak on darwin

authored by

Weijia Wang and committed by
GitHub
7ea26cf7 17148b8f

+9 -3
+1
pkgs/applications/science/math/glsurf/default.nix
··· 67 67 homepage = "https://raffalli.eu/~christophe/glsurf/"; 68 68 description = "A program to draw implicit surfaces and curves"; 69 69 license = lib.licenses.gpl2Plus; 70 + platforms = lib.platforms.all; 70 71 }; 71 72 }
+8 -3
pkgs/development/ocaml-modules/lablgl/default.nix
··· 1 - { lib, stdenv, fetchFromGitHub, ocaml, findlib, libGLU, libGL, freeglut } : 1 + { lib, stdenv, fetchFromGitHub, ocaml, findlib, libGLU, libGL, freeglut, darwin } : 2 2 3 3 if lib.versionOlder ocaml.version "4.03" 4 4 then throw "lablgl is not available for OCaml ${ocaml.version}" ··· 19 19 20 20 nativeBuildInputs = [ ocaml findlib ]; 21 21 buildInputs = [ freeglut ]; 22 - propagatedBuildInputs = [ libGLU libGL ]; 22 + propagatedBuildInputs = [ 23 + libGLU 24 + libGL 25 + ] ++ lib.optionals stdenv.isDarwin [ 26 + darwin.apple_sdk.frameworks.GLUT 27 + darwin.apple_sdk.libs.Xplugin 28 + ]; 23 29 24 30 patches = [ ./Makefile.config.patch ./META.patch ]; 25 31 ··· 46 52 license = licenses.gpl2; 47 53 maintainers = with maintainers; [ pSub vbgl ]; 48 54 mainProgram = "lablglut"; 49 - broken = stdenv.isDarwin; 50 55 }; 51 56 }