From f443d8a56e90484f375acd7a1192167c46ae9bbc Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Thu, 22 May 2025 03:26:14 +0200 Subject: [PATCH] python313Packages.pyrender: use llvmpipeHook Didn't know about this one, pretty neat! --- .../python-modules/pyrender/default.nix | 14 +++++++++++--- pkgs/top-level/python-packages.nix | 4 +++- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/pyrender/default.nix b/pkgs/development/python-modules/pyrender/default.nix index 1399a21b6fdb..04bbda7aa8ef 100644 --- a/pkgs/development/python-modules/pyrender/default.nix +++ b/pkgs/development/python-modules/pyrender/default.nix @@ -1,5 +1,6 @@ { lib, + stdenv, buildPythonPackage, pythonOlder, fetchFromGitHub, @@ -16,6 +17,7 @@ six, trimesh, pytestCheckHook, + mesa, }: buildPythonPackage rec { @@ -77,10 +79,16 @@ buildPythonPackage rec { env.PYOPENGL_PLATFORM = "egl"; # enables headless rendering during check - nativeCheckInputs = [ pytestCheckHook ]; + nativeCheckInputs = + [ + pytestCheckHook + ] + ++ lib.filter (lib.meta.availableOn stdenv.hostPlatform) [ + mesa.llvmpipeHook + ]; - disabledTestPaths = [ - # does not work inside sandbox, no GPU + disabledTestPaths = lib.optionals (!lib.meta.availableOn stdenv.hostPlatform mesa.llvmpipeHook) [ + # requires opengl context "tests/unit/test_offscreen.py" ]; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index c535be56dcdf..d81d719e9e4d 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -13290,7 +13290,9 @@ self: super: with self; { pyregion = callPackage ../development/python-modules/pyregion { }; - pyrender = callPackage ../development/python-modules/pyrender { }; + pyrender = callPackage ../development/python-modules/pyrender { + inherit (pkgs) mesa; + }; pyrevolve = callPackage ../development/python-modules/pyrevolve { };