From 8618fe6f96b9daecc98e7d7978bda6feac067191 Mon Sep 17 00:00:00 2001 From: Moraxyc Date: Sun, 10 Nov 2024 19:19:50 +0800 Subject: [PATCH 1/3] python312Packages.pyftgl: fix build on darwin --- pkgs/development/python-modules/pyftgl/default.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/pyftgl/default.nix b/pkgs/development/python-modules/pyftgl/default.nix index 4dd6aa9b6dd6..0bd0cf6a88db 100644 --- a/pkgs/development/python-modules/pyftgl/default.nix +++ b/pkgs/development/python-modules/pyftgl/default.nix @@ -28,13 +28,13 @@ buildPythonPackage rec { sha256 = "12zcjv4cwwjihiaf74kslrdmmk4bs47h7006gyqfwdfchfjdgg4r"; }; - postPatch = '' - sed -i "s,'boost_python','boost_python${pythonVersion}',g" setup.py - ''; - - env = lib.optionalAttrs stdenv.hostPlatform.isDarwin { - NIX_CFLAGS_COMPILE = "-L${libGL}/Library/Frameworks/OpenGL.framework/Versions/Current/Libraries"; - }; + postPatch = + '' + sed -i "s,'boost_python','boost_python${pythonVersion}',g" setup.py + '' + + lib.optionalString stdenv.hostPlatform.isDarwin '' + export NIX_CFLAGS_COMPILE+=" -L$SDKROOT/System/Library/Frameworks/OpenGL.framework/Versions/Current/Libraries" + ''; buildInputs = [ boost From beceecb51336d5a52e71a744f9d5f24b63c8f3b8 Mon Sep 17 00:00:00 2001 From: Moraxyc Date: Sun, 10 Nov 2024 19:27:53 +0800 Subject: [PATCH 2/3] python312Packages.pyftgl: fix source --- pkgs/development/python-modules/pyftgl/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/pyftgl/default.nix b/pkgs/development/python-modules/pyftgl/default.nix index 0bd0cf6a88db..76d0bc6804e5 100644 --- a/pkgs/development/python-modules/pyftgl/default.nix +++ b/pkgs/development/python-modules/pyftgl/default.nix @@ -23,9 +23,9 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "umlaeute"; - repo = "${pname}-${version}"; - rev = version; - sha256 = "12zcjv4cwwjihiaf74kslrdmmk4bs47h7006gyqfwdfchfjdgg4r"; + repo = "pyftgl"; + rev = "refs/tags/${version}"; + sha256 = "sha256-mbzXpIPMNe6wfwaAAw/Ri8xaW6Z6kuNUhFFyzsiW7Is="; }; postPatch = From 551bd11c42de32a031f980bbbf0f76e2543a0b7f Mon Sep 17 00:00:00 2001 From: Moraxyc Date: Sun, 10 Nov 2024 19:36:10 +0800 Subject: [PATCH 3/3] python312Packages.pyftgl: refactor and modenize --- pkgs/development/python-modules/pyftgl/default.nix | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/pyftgl/default.nix b/pkgs/development/python-modules/pyftgl/default.nix index 76d0bc6804e5..93bfb7a8ec36 100644 --- a/pkgs/development/python-modules/pyftgl/default.nix +++ b/pkgs/development/python-modules/pyftgl/default.nix @@ -3,6 +3,7 @@ buildPythonPackage, fetchFromGitHub, stdenv, + setuptools, boost, freetype, ftgl, @@ -12,14 +13,12 @@ }: let - pythonVersion = with lib.versions; "${major python.version}${minor python.version}"; in - buildPythonPackage rec { pname = "pyftgl"; version = "0.4b"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "umlaeute"; @@ -28,9 +27,12 @@ buildPythonPackage rec { sha256 = "sha256-mbzXpIPMNe6wfwaAAw/Ri8xaW6Z6kuNUhFFyzsiW7Is="; }; + build-system = [ setuptools ]; + postPatch = '' - sed -i "s,'boost_python','boost_python${pythonVersion}',g" setup.py + substituteInPlace setup.py \ + --replace-fail boost_python boost_python${pythonVersion} '' + lib.optionalString stdenv.hostPlatform.isDarwin '' export NIX_CFLAGS_COMPILE+=" -L$SDKROOT/System/Library/Frameworks/OpenGL.framework/Versions/Current/Libraries" @@ -44,8 +46,8 @@ buildPythonPackage rec { libGL ]; - meta = with lib; { + meta = { description = "Python bindings for FTGL (FreeType for OpenGL)"; - license = licenses.gpl2Plus; + license = lib.licenses.gpl2Plus; }; }