From f19ed998f6d51a5318e7d3de3ef2c4968dc45ac7 Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Sun, 20 Apr 2025 16:22:50 +0200 Subject: [PATCH] embree2: 2.17.4 -> 2.17.7 Diff: https://github.com/embree/embree/compare/refs/tags/v2.17.4...2.17.7 --- pkgs/development/libraries/embree/2.x.nix | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/embree/2.x.nix b/pkgs/development/libraries/embree/2.x.nix index e199f67f7859..00f6e3caad84 100644 --- a/pkgs/development/libraries/embree/2.x.nix +++ b/pkgs/development/libraries/embree/2.x.nix @@ -5,25 +5,26 @@ cmake, pkg-config, ispc, - tbb, + tbb_2020_3, glfw, openimageio, libjpeg, libpng, libpthreadstubs, libX11, + python3Packages, nix-update-script, }: stdenv.mkDerivation (finalAttrs: { pname = "embree"; - version = "2.17.4"; + version = "2.17.7"; src = fetchFromGitHub { owner = "embree"; repo = "embree"; tag = "v${finalAttrs.version}"; - sha256 = "0q3r724r58j4b6cbyy657fsb78z7a2c7d5mwdp7552skynsn2mn9"; + hash = "sha256-FD/ITZBJnYy1F+x4jLTVTsGsNKy/mS7OYWP06NoHZqc="; }; cmakeFlags = [ "-DEMBREE_TUTORIALS=OFF" ]; @@ -34,7 +35,8 @@ stdenv.mkDerivation (finalAttrs: { ]; buildInputs = [ ispc - tbb + # tbb_2021_0 is not backward compatible + tbb_2020_3 glfw openimageio libjpeg @@ -50,6 +52,10 @@ stdenv.mkDerivation (finalAttrs: { "v(2.*)" ]; }; + tbb = tbb_2020_3; + tests = { + inherit (python3Packages) embreex; + }; }; meta = with lib; {