pyrox.dev / nixpkgs
lol
fork atom

Merge pull request #216844 from hesiod/fix-216390

embree, openimagedenoise: Fix build failure due to TBB split

authored by Artturi and committed by GitHub 35b188cf 52304581

+12
unified split
+2
pkgs/development/libraries/embree/default.nix
··· 24 cmakeFlags = [ 25 "-DEMBREE_TUTORIALS=OFF" 26 "-DEMBREE_RAY_MASK=ON" 27 ]; 28 29
··· 24 cmakeFlags = [ 25 "-DEMBREE_TUTORIALS=OFF" 26 "-DEMBREE_RAY_MASK=ON" 27 + "-DTBB_ROOT=${tbb}" 28 + "-DTBB_INCLUDE_DIR=${tbb.dev}/include" 29 ]; 30 31
+5
pkgs/development/libraries/openimagedenoise/1_2_x.nix
··· 13 nativeBuildInputs = [ cmake python3 ispc ]; 14 buildInputs = [ tbb ]; 15 16 meta = with lib; { 17 homepage = "https://openimagedenoise.github.io"; 18 description = "High-Performance Denoising Library for Ray Tracing";
··· 13 nativeBuildInputs = [ cmake python3 ispc ]; 14 buildInputs = [ tbb ]; 15 16 + cmakeFlags = [ 17 + "-DTBB_ROOT=${tbb}" 18 + "-DTBB_INCLUDE_DIR=${tbb.dev}/include" 19 + ]; 20 + 21 meta = with lib; { 22 homepage = "https://openimagedenoise.github.io"; 23 description = "High-Performance Denoising Library for Ray Tracing";
+5
pkgs/development/libraries/openimagedenoise/default.nix
··· 13 nativeBuildInputs = [ cmake python3 ispc ]; 14 buildInputs = [ tbb ]; 15 16 meta = with lib; { 17 homepage = "https://openimagedenoise.github.io"; 18 description = "High-Performance Denoising Library for Ray Tracing";
··· 13 nativeBuildInputs = [ cmake python3 ispc ]; 14 buildInputs = [ tbb ]; 15 16 + cmakeFlags = [ 17 + "-DTBB_ROOT=${tbb}" 18 + "-DTBB_INCLUDE_DIR=${tbb.dev}/include" 19 + ]; 20 + 21 meta = with lib; { 22 homepage = "https://openimagedenoise.github.io"; 23 description = "High-Performance Denoising Library for Ray Tracing";