diff options
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/embree/default.nix')
-rw-r--r-- | nixpkgs/pkgs/development/libraries/embree/default.nix | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/nixpkgs/pkgs/development/libraries/embree/default.nix b/nixpkgs/pkgs/development/libraries/embree/default.nix index fb8db3a218e6..419572f3ff16 100644 --- a/nixpkgs/pkgs/development/libraries/embree/default.nix +++ b/nixpkgs/pkgs/development/libraries/embree/default.nix @@ -1,17 +1,25 @@ -{ stdenv, lib, fetchFromGitHub, cmake, pkg-config, ispc, tbb, glfw, +{ stdenv, lib, fetchFromGitHub, fetchpatch, cmake, pkg-config, ispc, tbb, glfw, openimageio, libjpeg, libpng, libpthreadstubs, libX11, glib }: stdenv.mkDerivation rec { pname = "embree"; - version = "3.13.4"; + version = "3.13.5"; src = fetchFromGitHub { owner = "embree"; repo = "embree"; rev = "v${version}"; - sha256 = "sha256-WmblxU1kHiC8+hYAfUDcbJ1/e80f1LcKX8qCwgaBwGc="; + sha256 = "sha256-tfM4SGOFVBG0pQK9B/iN2xDaW3yjefnTtsoUad75m80="; }; + patches = [ + (fetchpatch { + name = "fixed-compilation-issues-for-arm-aarch64-processor-under-linux.patch"; + url = "https://github.com/embree/embree/commit/82ca6b5ccb7abe0403a658a0e079926478f04cb1.patch"; + hash = "sha256-l9S4PBk+yQUypQ22l05daD0ruouZKE4VHkGvzKxkH4o="; + }) + ]; + postPatch = '' # Fix duplicate /nix/store/.../nix/store/.../ paths sed -i "s|SET(EMBREE_ROOT_DIR .*)|set(EMBREE_ROOT_DIR $out)|" \ @@ -24,9 +32,10 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DEMBREE_TUTORIALS=OFF" "-DEMBREE_RAY_MASK=ON" + "-DTBB_ROOT=${tbb}" + "-DTBB_INCLUDE_DIR=${tbb.dev}/include" ]; - nativeBuildInputs = [ ispc pkg-config cmake ]; buildInputs = [ tbb glfw openimageio libjpeg libpng libX11 libpthreadstubs ] ++ lib.optionals stdenv.isDarwin [ glib ]; |