From e7ac3946b4836c11914594f6be2db463f9433758 Mon Sep 17 00:00:00 2001 From: Ben Wolsieffer Date: Sat, 15 May 2021 11:23:25 -0400 Subject: [PATCH] fcl: add upstream patches to fix build on ARM Previously, SSE was unconditionally enabled, which can't work on ARM. --- pkgs/development/libraries/fcl/default.nix | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/fcl/default.nix b/pkgs/development/libraries/fcl/default.nix index 21e6b9cac89..33a60080584 100644 --- a/pkgs/development/libraries/fcl/default.nix +++ b/pkgs/development/libraries/fcl/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, eigen, libccd, octomap }: +{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, eigen, libccd, octomap }: stdenv.mkDerivation rec { pname = "fcl"; @@ -11,6 +11,21 @@ stdenv.mkDerivation rec { sha256 = "1i1sd0fsvk5d529aw8aw29bsmymqgcmj3ci35sz58nzp2wjn0l5d"; }; + patches = [ + # Disable SSE on Emscripten (required for the next patch to apply cleanly) + # https://github.com/flexible-collision-library/fcl/pull/470 + (fetchpatch { + url = "https://github.com/flexible-collision-library/fcl/commit/83a1af61ba4efa81ec0b552b3121100044a8cf46.patch"; + sha256 = "0bbkv4xpkl3c0i8qdlkghj6qkybrrd491c8rd2cqnxfgspcd40p0"; + }) + # Detect SSE support to fix building on ARM + # https://github.com/flexible-collision-library/fcl/pull/506 + (fetchpatch { + url = "https://github.com/flexible-collision-library/fcl/commit/cbfe1e9405aa68138ed1a8f33736429b85500dea.patch"; + sha256 = "18qip8gwhm3fvbz1cvzf625rh5msq8m4669ld1m60fv6z50clr9h"; + }) + ]; + nativeBuildInputs = [ cmake ]; propagatedBuildInputs = [ eigen libccd octomap ];