From 28c3001bf01f1485c0669653943fd1f7a8d0a0f8 Mon Sep 17 00:00:00 2001 From: Tobias Markus Date: Fri, 17 Feb 2023 19:50:00 +0100 Subject: [PATCH 1/2] embree: Fix build failure due to TBB split Fixes #216390. --- pkgs/development/libraries/embree/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/libraries/embree/default.nix b/pkgs/development/libraries/embree/default.nix index e4509d058dae8..5cab69db676f2 100644 --- a/pkgs/development/libraries/embree/default.nix +++ b/pkgs/development/libraries/embree/default.nix @@ -24,6 +24,8 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DEMBREE_TUTORIALS=OFF" "-DEMBREE_RAY_MASK=ON" + "-DTBB_ROOT=${tbb}" + "-DTBB_INCLUDE_DIR=${tbb.dev}/include" ]; From 8fed24cfd7041c490c94fa39c1b2e11c551471b0 Mon Sep 17 00:00:00 2001 From: Tobias Markus Date: Fri, 17 Feb 2023 20:46:18 +0100 Subject: [PATCH 2/2] openimagedenoise: Fix build failure due to TBB split Fixes #216580. Co-authored-by: davidak --- pkgs/development/libraries/openimagedenoise/1_2_x.nix | 5 +++++ pkgs/development/libraries/openimagedenoise/default.nix | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/pkgs/development/libraries/openimagedenoise/1_2_x.nix b/pkgs/development/libraries/openimagedenoise/1_2_x.nix index 10f6abd79ef81..7b2901b69b76b 100644 --- a/pkgs/development/libraries/openimagedenoise/1_2_x.nix +++ b/pkgs/development/libraries/openimagedenoise/1_2_x.nix @@ -13,6 +13,11 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake python3 ispc ]; buildInputs = [ tbb ]; + cmakeFlags = [ + "-DTBB_ROOT=${tbb}" + "-DTBB_INCLUDE_DIR=${tbb.dev}/include" + ]; + meta = with lib; { homepage = "https://openimagedenoise.github.io"; description = "High-Performance Denoising Library for Ray Tracing"; diff --git a/pkgs/development/libraries/openimagedenoise/default.nix b/pkgs/development/libraries/openimagedenoise/default.nix index 8d02b976c91f2..532ee7a095718 100644 --- a/pkgs/development/libraries/openimagedenoise/default.nix +++ b/pkgs/development/libraries/openimagedenoise/default.nix @@ -13,6 +13,11 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake python3 ispc ]; buildInputs = [ tbb ]; + cmakeFlags = [ + "-DTBB_ROOT=${tbb}" + "-DTBB_INCLUDE_DIR=${tbb.dev}/include" + ]; + meta = with lib; { homepage = "https://openimagedenoise.github.io"; description = "High-Performance Denoising Library for Ray Tracing";