From 4f81a22f45437d7827497763821d89392e6a0c72 Mon Sep 17 00:00:00 2001
From: Niklas Hambüchen <mail@nh2.me>
Date: Tue, 17 Aug 2021 19:56:17 +0200
Subject: cloudcompare: Allow building with `pdal` 2.3.0

See https://github.com/CloudCompare/CloudCompare/pull/1478
---
 pkgs/applications/graphics/cloudcompare/default.nix | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

(limited to 'pkgs/applications/graphics/cloudcompare')

diff --git a/pkgs/applications/graphics/cloudcompare/default.nix b/pkgs/applications/graphics/cloudcompare/default.nix
index 26fabc364ba..9fbe390f5d8 100644
--- a/pkgs/applications/graphics/cloudcompare/default.nix
+++ b/pkgs/applications/graphics/cloudcompare/default.nix
@@ -1,6 +1,7 @@
 { lib
 , mkDerivation
 , fetchFromGitHub
+, fetchpatch
 , cmake
 , dxflib
 , eigen
@@ -18,7 +19,7 @@
 
 mkDerivation rec {
   pname = "cloudcompare";
-  version = "2.11.2";
+  version = "2.11.2"; # Remove below patch with the next version bump.
 
   src = fetchFromGitHub {
     owner = "CloudCompare";
@@ -33,6 +34,15 @@ mkDerivation rec {
     fetchSubmodules = true;
   };
 
+  patches = [
+    # TODO: Remove with next CloudCompare release (see https://github.com/CloudCompare/CloudCompare/pull/1478)
+    (fetchpatch {
+      name = "CloudCompare-fix-for-PDAL-2.3.0.patch";
+      url = "https://github.com/CloudCompare/CloudCompare/commit/f3038dcdeb0491c4a653c2ee6fb017326eb676a3.patch";
+      sha256 = "0ca5ry987mcgsdawz5yd4xhbsdb5k44qws30srxymzx2djvamwli";
+    })
+  ];
+
   nativeBuildInputs = [
     cmake
     eigen # header-only
-- 
cgit 1.4.1