diff options
| author | Ben Wolsieffer <benwolsieffer@gmail.com> | 2021-05-26 23:56:18 -0400 |
|---|---|---|
| committer | Ben Wolsieffer <benwolsieffer@gmail.com> | 2021-05-28 21:34:18 -0400 |
| commit | 71cf65cec5786c5ad756e5f3df915846a3f85bf5 (patch) | |
| tree | f60c1e71f4c56e1940b5f3aa2ba60c91740b6515 | |
| parent | 2a6db4c056b66006804ec39d4185363d1d5f9658 (diff) | |
| download | nixpkgs-71cf65cec5786c5ad756e5f3df915846a3f85bf5.tar nixpkgs-71cf65cec5786c5ad756e5f3df915846a3f85bf5.tar.gz nixpkgs-71cf65cec5786c5ad756e5f3df915846a3f85bf5.tar.bz2 nixpkgs-71cf65cec5786c5ad756e5f3df915846a3f85bf5.tar.lz nixpkgs-71cf65cec5786c5ad756e5f3df915846a3f85bf5.tar.xz nixpkgs-71cf65cec5786c5ad756e5f3df915846a3f85bf5.tar.zst nixpkgs-71cf65cec5786c5ad756e5f3df915846a3f85bf5.zip | |
pcl: fix convex hull support
PCL requires a patch to be compatible with QHull 2020.2. The patch has been accepted upstream, but this commit uses a version of the patch from Conda, which has been backported to 1.11.
| -rw-r--r-- | pkgs/development/libraries/pcl/default.nix | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/pkgs/development/libraries/pcl/default.nix b/pkgs/development/libraries/pcl/default.nix index b8cdff1f48c..2b2763b5a05 100644 --- a/pkgs/development/libraries/pcl/default.nix +++ b/pkgs/development/libraries/pcl/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, fetchpatch , wrapQtAppsHook , cmake , qhull @@ -30,6 +31,15 @@ stdenv.mkDerivation rec { sha256 = "1cli2rxqsk6nxp36p5mgvvahjz8hm4fb68yi8cf9nw4ygbcvcwb1"; }; + patches = [ + # Support newer QHull versions (2020.2) + # Backport of https://github.com/PointCloudLibrary/pcl/pull/4540 + (fetchpatch { + url = "https://raw.githubusercontent.com/conda-forge/pcl-feedstock/0b1eff402994a3fb891b44659c261e7e85c8d915/recipe/4540.patch"; + sha256 = "0hhvw6ajigzrarn95aicni73zd3sdgnb8rc3wgjrrg19xs84z138"; + }) + ]; + nativeBuildInputs = [ pkg-config cmake wrapQtAppsHook ]; buildInputs = [ qhull |