From 522463b4f22f04ee870cff8b8eb1c80b0ae3b6a9 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Mon, 5 Jun 2023 12:09:18 +0300 Subject: [PATCH] python310Packages.pyopengl: unbreak on darwin --- pkgs/development/python-modules/pyopengl/default.nix | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/pyopengl/default.nix b/pkgs/development/python-modules/pyopengl/default.nix index ecc0e307e7f3..94b5d38d3fc8 100644 --- a/pkgs/development/python-modules/pyopengl/default.nix +++ b/pkgs/development/python-modules/pyopengl/default.nix @@ -18,17 +18,14 @@ buildPythonPackage rec { propagatedBuildInputs = [ pillow ]; patchPhase = let - ext = stdenv.hostPlatform.extensions.sharedLibrary; in '' + ext = stdenv.hostPlatform.extensions.sharedLibrary; in lib.optionalString (!stdenv.isDarwin) '' # Theses lines are patching the name of dynamic libraries # so pyopengl can find them at runtime. substituteInPlace OpenGL/platform/glx.py \ --replace "'GL'" "'${pkgs.libGL}/lib/libGL${ext}'" \ --replace "'GLU'" "'${pkgs.libGLU}/lib/libGLU${ext}'" \ --replace "'glut'" "'${pkgs.freeglut}/lib/libglut${ext}'" - substituteInPlace OpenGL/platform/darwin.py \ - --replace "'OpenGL'" "'${pkgs.libGL}/lib/libGL${ext}'" \ - --replace "'GLUT'" "'${pkgs.freeglut}/lib/libglut${ext}'" - + '' + '' # https://github.com/NixOS/nixpkgs/issues/76822 # pyopengl introduced a new "robust" way of loading libraries in 3.1.4. # The later patch of the filepath does not work anymore because