diff options
| author | Bobby Rong <rjl931189261@126.com> | 2021-09-15 14:43:06 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-15 14:43:06 +0800 |
| commit | ff748a82a5fff004c952f32eacd64604a6f4036f (patch) | |
| tree | fbeacdf5f4ddba465bb325b8b814ac522f1522c1 | |
| parent | ff94eef5c14da66ede95e968425afb1eda2c788b (diff) | |
| parent | 6b48a031d9cc47356b4e7e3e2cb8967446890261 (diff) | |
| download | nixpkgs-ff748a82a5fff004c952f32eacd64604a6f4036f.tar nixpkgs-ff748a82a5fff004c952f32eacd64604a6f4036f.tar.gz nixpkgs-ff748a82a5fff004c952f32eacd64604a6f4036f.tar.bz2 nixpkgs-ff748a82a5fff004c952f32eacd64604a6f4036f.tar.lz nixpkgs-ff748a82a5fff004c952f32eacd64604a6f4036f.tar.xz nixpkgs-ff748a82a5fff004c952f32eacd64604a6f4036f.tar.zst nixpkgs-ff748a82a5fff004c952f32eacd64604a6f4036f.zip | |
Merge pull request #137606 from lopsided98/fcl-update
fcl: 0.6.1 -> 0.7.0
| -rw-r--r-- | pkgs/development/libraries/fcl/default.nix | 19 |
1 files changed, 2 insertions, 17 deletions
diff --git a/pkgs/development/libraries/fcl/default.nix b/pkgs/development/libraries/fcl/default.nix index 33a60080584..4e13a3f7113 100644 --- a/pkgs/development/libraries/fcl/default.nix +++ b/pkgs/development/libraries/fcl/default.nix @@ -2,30 +2,15 @@ stdenv.mkDerivation rec { pname = "fcl"; - version = "0.6.1"; + version = "0.7.0"; src = fetchFromGitHub { owner = "flexible-collision-library"; repo = pname; rev = version; - sha256 = "1i1sd0fsvk5d529aw8aw29bsmymqgcmj3ci35sz58nzp2wjn0l5d"; + sha256 = "0f5lhg6f9np7w16s6wz4mb349bycil1irk8z8ylfjwllxi4n6x7a"; }; - 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 ]; |