git.iko.soy/typeable/nixpkgs
on master help sign in
embree: 3.11.0 -> 3.12.0

And fix build on darwin.

commit436be88e13fce0cc65d3dddeb17bd5d3a6e73f3f authorBen Siraphob <bensiraphob@gmail.com> dateTue 6 Oct 2020, 21:00 (6 years ago) parentd5f1dce
1 file changed+9−5
pkgs/development/libraries/embree/default.nix+9−5
pkgs/development/libraries/embree/default.nix+9−5
@@ -1,15 +1,15 @@
1−{ stdenv, fetchFromGitHub, cmake, pkgconfig, ispc, tbb, glfw,
2− openimageio, libjpeg, libpng, libpthreadstubs, libX11 }:
1+{ stdenv, lib, fetchFromGitHub, cmake, pkgconfig, ispc, tbb, glfw,
2+ openimageio, libjpeg, libpng, libpthreadstubs, libX11, glib }:
33
44stdenv.mkDerivation rec {
55 pname = "embree";
6− version = "3.11.0";
6+ version = "3.12.0";
77
88 src = fetchFromGitHub {
99 owner = "embree";
1010 repo = "embree";
1111 rev = "v${version}";
12− sha256 = "0v5gqi8jp09xxcbyyknji83412bq4l0w35b6hnrqxycgdrnf7hkr";
12+ sha256 = "1q06fkfww8z8pcnhaqc4d2zi8hn620i9h9dmpnrfy3azalvizhkq";
1313 };
1414
1515 postPatch = ''
@@ -17,6 +17,8 @@ stdenv.mkDerivation rec {
1717 sed -i "s|SET(EMBREE_ROOT_DIR .*)|set(EMBREE_ROOT_DIR $out)|" \
1818 common/cmake/embree-config.cmake
1919 sed -i "s|$""{EMBREE_ROOT_DIR}/||" common/cmake/embree-config.cmake
20+ substituteInPlace common/math/math.h --replace 'defined(__MACOSX__) && !defined(__INTEL_COMPILER)' 0
21+ substituteInPlace common/math/math.h --replace 'defined(__WIN32__) || defined(__FreeBSD__)' 'defined(__WIN32__) || defined(__FreeBSD__) || defined(__MACOSX__)'
2022 '';
2123
2224 cmakeFlags = [
@@ -24,8 +26,10 @@ stdenv.mkDerivation rec {
2426 "-DEMBREE_RAY_MASK=ON"
2527 ];
2628
29+
2730 nativeBuildInputs = [ ispc pkgconfig cmake ];
28− buildInputs = [ tbb glfw openimageio libjpeg libpng libX11 libpthreadstubs ];
31+ buildInputs = [ tbb glfw openimageio libjpeg libpng libX11 libpthreadstubs ]
32+ ++ lib.optionals stdenv.isDarwin [ glib ];
2933
3034 meta = with stdenv.lib; {
3135 description = "High performance ray tracing kernels from Intel";