diff --git a/pkgs/development/python-modules/embreex/default.nix b/pkgs/development/python-modules/embreex/default.nix index 38b2904a2cbf..5d76b5a8bbd4 100644 --- a/pkgs/development/python-modules/embreex/default.nix +++ b/pkgs/development/python-modules/embreex/default.nix @@ -3,7 +3,7 @@ fetchFromGitHub, fetchpatch, buildPythonPackage, - embree2, + embree, cython, numpy, setuptools, @@ -12,25 +12,16 @@ buildPythonPackage rec { pname = "embreex"; - version = "2.17.7.post6"; + version = "4.4.0"; pyproject = true; src = fetchFromGitHub { owner = "trimesh"; repo = "embreex"; tag = version; - hash = "sha256-iLIfhngorSFOdkOvlCAJQXGQrVuRfBSDGzvjXOlQuHk="; + hash = "sha256-mUPc9CMHsFYb1ELBmj+XXCjYEIW1iV8ZaRCQ40tYS8w="; }; - patches = [ - # https://github.com/trimesh/embreex/pull/7 - (fetchpatch { - name = "fix-use-after-free.patch"; - url = "https://github.com/trimesh/embreex/commit/c6b047285419f8986fae962e2734a01522be7ef7.patch"; - hash = "sha256-s8x2vsqbsIR3aoNUDrYs2vQttuNY8lLJ6TC7H8FMRyQ="; - }) - ]; - build-system = [ setuptools numpy @@ -42,8 +33,7 @@ buildPythonPackage rec { ]; buildInputs = [ - embree2 - embree2.tbb + embree ]; pythonImportsCheck = [ @@ -51,7 +41,6 @@ buildPythonPackage rec { "embreex.mesh_construction" "embreex.rtcore" "embreex.rtcore_scene" - "embreex.triangles" ]; preCheck = '' @@ -62,11 +51,11 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook ]; meta = { - description = "Maintained PyEmbree fork, wrapper for Embree v2"; + description = "Maintained PyEmbree fork, bindings for Intel's Embree ray engine"; homepage = "https://github.com/trimesh/embreex"; changelog = "https://github.com/trimesh/embreex/releases/tag/${src.tag}"; license = lib.licenses.bsd2; maintainers = with lib.maintainers; [ pbsds ]; - inherit (embree2.meta) platforms; + inherit (embree.meta) platforms; }; }