From 23b1625664efc29e3ad89ffd645b2140b1888ba1 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Wed, 7 Jun 2023 12:15:16 +0300 Subject: [PATCH] embree: unbreak on aarch64-linux --- pkgs/development/libraries/embree/default.nix | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/embree/default.nix b/pkgs/development/libraries/embree/default.nix index 552859cd4a5d..419572f3ff16 100644 --- a/pkgs/development/libraries/embree/default.nix +++ b/pkgs/development/libraries/embree/default.nix @@ -1,4 +1,4 @@ -{ 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 { @@ -12,6 +12,14 @@ stdenv.mkDerivation rec { 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)|" \ @@ -28,7 +36,6 @@ stdenv.mkDerivation rec { "-DTBB_INCLUDE_DIR=${tbb.dev}/include" ]; - nativeBuildInputs = [ ispc pkg-config cmake ]; buildInputs = [ tbb glfw openimageio libjpeg libpng libX11 libpthreadstubs ] ++ lib.optionals stdenv.isDarwin [ glib ]; @@ -39,6 +46,5 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ hodapp gebner ]; license = licenses.asl20; platforms = platforms.unix; - badPlatforms = [ "aarch64-linux" ]; }; }