From 71cf65cec5786c5ad756e5f3df915846a3f85bf5 Mon Sep 17 00:00:00 2001 From: Ben Wolsieffer Date: Wed, 26 May 2021 23:56:18 -0400 Subject: [PATCH] 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. --- pkgs/development/libraries/pcl/default.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pkgs/development/libraries/pcl/default.nix b/pkgs/development/libraries/pcl/default.nix index b8cdff1f48c8..2b2763b5a05d 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