diff options
| author | Lluís Batlle i Rossell <viric@viric.name> | 2018-07-28 19:25:14 +0200 |
|---|---|---|
| committer | Lluís Batlle i Rossell <viric@viric.name> | 2018-07-28 19:25:14 +0200 |
| commit | f54b387b63299245092d9bbf09cb562bac125461 (patch) | |
| tree | 0c09809c0964d7bd931c6c8d1a7d19dcac342abd /pkgs/development/libraries/pcl/default.nix | |
| parent | 66d7126255b96a3d9c1cc0cdd7c2cd79d1789758 (diff) | |
| parent | 0fa2cbf59f7f68a8b9213a9cf9d2cd6dd2e518cc (diff) | |
| download | nixpkgs-f54b387b63299245092d9bbf09cb562bac125461.tar nixpkgs-f54b387b63299245092d9bbf09cb562bac125461.tar.gz nixpkgs-f54b387b63299245092d9bbf09cb562bac125461.tar.bz2 nixpkgs-f54b387b63299245092d9bbf09cb562bac125461.tar.lz nixpkgs-f54b387b63299245092d9bbf09cb562bac125461.tar.xz nixpkgs-f54b387b63299245092d9bbf09cb562bac125461.tar.zst nixpkgs-f54b387b63299245092d9bbf09cb562bac125461.zip | |
Merge remote-tracking branch 'central/master' into viric_clean
Diffstat (limited to 'pkgs/development/libraries/pcl/default.nix')
| -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 59f674789e4..9fb2e0b7fed 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 ]; |