public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fcl: add upstream patches to fix build on ARM 

Previously, SSE was unconditionally enabled, which can't work on ARM.
This commit is contained in:
Ben Wolsieffer 2021-05-15 11:23:25 -04:00
parent f3c7a6c56a
commit e7ac3946b4
1 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
pkgs/development/libraries/fcl/default.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, cmake, eigen, libccd, octomap }: { lib, stdenv, fetchFromGitHub, fetchpatch, cmake, eigen, libccd, octomap }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "fcl"; pname = "fcl";
@ -11,6 +11,21 @@ stdenv.mkDerivation rec {
sha256 = "1i1sd0fsvk5d529aw8aw29bsmymqgcmj3ci35sz58nzp2wjn0l5d"; 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 ]; nativeBuildInputs = [ cmake ];
propagatedBuildInputs = [ eigen libccd octomap ]; propagatedBuildInputs = [ eigen libccd octomap ];