From ce2cf87cb38a4d45674cf7e8125dca60fb85b954 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 11 Aug 2024 02:21:12 +0000 Subject: [PATCH 1/2] python312Packages.glcontext: 2.5.0 -> 3.0.0 --- pkgs/development/python-modules/glcontext/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/glcontext/default.nix b/pkgs/development/python-modules/glcontext/default.nix index a62e403fc260..fa0194872f45 100644 --- a/pkgs/development/python-modules/glcontext/default.nix +++ b/pkgs/development/python-modules/glcontext/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "glcontext"; - version = "2.5.0"; + version = "3.0.0"; format = "setuptools"; src = fetchFromGitHub { owner = "moderngl"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-ld+INKIGDZA2Y+sTxDPY7MI1nru6x+FeixngaJQzKkg="; + hash = "sha256-GC2sb6xQjg99xLcXSynLOOyyqNwCHZwZqrs9RZh99pY="; }; disabled = !isPy3k; From 2ac7beeaceda3a70e692e4a4128f372ad7e55be7 Mon Sep 17 00:00:00 2001 From: natsukium Date: Sun, 18 Aug 2024 09:14:57 +0900 Subject: [PATCH 2/2] python312Packages.glcontext: refactor --- .../python-modules/glcontext/default.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/glcontext/default.nix b/pkgs/development/python-modules/glcontext/default.nix index fa0194872f45..900441f57bee 100644 --- a/pkgs/development/python-modules/glcontext/default.nix +++ b/pkgs/development/python-modules/glcontext/default.nix @@ -2,7 +2,7 @@ lib, buildPythonPackage, fetchFromGitHub, - isPy3k, + setuptools, libGL, libX11, }: @@ -10,16 +10,16 @@ buildPythonPackage rec { pname = "glcontext"; version = "3.0.0"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "moderngl"; - repo = pname; + repo = "glcontext"; rev = "refs/tags/${version}"; hash = "sha256-GC2sb6xQjg99xLcXSynLOOyyqNwCHZwZqrs9RZh99pY="; }; - disabled = !isPy3k; + build-system = [ setuptools ]; buildInputs = [ libGL @@ -28,11 +28,11 @@ buildPythonPackage rec { postPatch = '' substituteInPlace glcontext/x11.cpp \ - --replace '"libGL.so"' '"${libGL}/lib/libGL.so"' \ - --replace '"libX11.so"' '"${libX11}/lib/libX11.so"' + --replace-fail '"libGL.so"' '"${libGL}/lib/libGL.so"' \ + --replace-fail '"libX11.so"' '"${libX11}/lib/libX11.so"' substituteInPlace glcontext/egl.cpp \ - --replace '"libGL.so"' '"${libGL}/lib/libGL.so"' \ - --replace '"libEGL.so"' '"${libGL}/lib/libEGL.so"' + --replace-fail '"libGL.so"' '"${libGL}/lib/libGL.so"' \ + --replace-fail '"libEGL.so"' '"${libGL}/lib/libEGL.so"' ''; # Tests fail because they try to open display. See