diff options
author | Anthony Cowley <acowley@gmail.com> | 2018-07-17 14:32:29 -0400 |
---|---|---|
committer | Franz Pletz <fpletz@fnordicwalking.de> | 2018-07-25 13:49:57 +0000 |
commit | 9f22576897b272300b48c312c5956cfab66acfc6 (patch) | |
tree | fb5eb34796cec9d89f268a34ab6a48c56a101f77 /pkgs/development/libraries/pcl | |
parent | cd5095c0ee9115158668f949f4a7700bb0130142 (diff) |
pcl: boost167 compatibility
Cherry pick an upstream commit not yet available in a tagged release.
Diffstat (limited to 'pkgs/development/libraries/pcl')
-rw-r--r-- | pkgs/development/libraries/pcl/default.nix | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/pkgs/development/libraries/pcl/default.nix b/pkgs/development/libraries/pcl/default.nix index 59f674789e478..9fb2e0b7fedb2 100644 --- a/pkgs/development/libraries/pcl/default.nix +++ b/pkgs/development/libraries/pcl/default.nix @@ -1,4 +1,5 @@ -{ stdenv, fetchFromGitHub, cmake, qhull, flann, boost, vtk, eigen, pkgconfig, qtbase +{ stdenv, fetchFromGitHub, fetchpatch, cmake +, qhull, flann, boost, vtk, eigen, pkgconfig, qtbase , libusb1, libpcap, libXt, libpng, Cocoa, AGL, cf-private, OpenGL }: @@ -12,6 +13,14 @@ stdenv.mkDerivation rec { sha256 = "05wvqqi2fyk5innw4mg356r71c1hmc9alc7xkf4g81ds3b3867xq"; }; + patches = [ + # boost-1.67 compatibility + (fetchpatch { + url = "https://github.com/PointCloudLibrary/pcl/commit/2309bdab20fb2a385d374db6a87349199279db18.patch"; + sha256 = "112p4687xrm0vsm0magmkvsm1hpks9hj42fm0lncy3yy2j1v3r4h"; + name = "boost167-random.patch"; + })]; + enableParallelBuilding = true; nativeBuildInputs = [ pkgconfig cmake ]; |