Unverified Commit 35b188cf authored by Artturi's avatar Artturi Committed by GitHub
Browse files

Merge pull request #216844 from hesiod/fix-216390 

embree, openimagedenoise: Fix build failure due to TBB split
parents 52304581 8fed24cf

pkgs/development/libraries/embree/default.nix

+2 −0
Original line number Diff line number Diff line
@@ -24,6 +24,8 @@ stdenv.mkDerivation rec { 
  cmakeFlags = [

    "-DEMBREE_TUTORIALS=OFF"

    "-DEMBREE_RAY_MASK=ON"

    "-DTBB_ROOT=${tbb}"

    "-DTBB_INCLUDE_DIR=${tbb.dev}/include"

  ];

pkgs/development/libraries/openimagedenoise/1_2_x.nix

+5 −0
Original line number Diff line number Diff line
@@ -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";

pkgs/development/libraries/openimagedenoise/default.nix

+5 −0
Original line number Diff line number Diff line
@@ -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";