diff options
| author | Niklas Hambüchen <mail@nh2.me> | 2021-08-17 19:56:17 +0200 |
|---|---|---|
| committer | Niklas Hambüchen <mail@nh2.me> | 2021-08-17 19:56:57 +0200 |
| commit | 4f81a22f45437d7827497763821d89392e6a0c72 (patch) | |
| tree | c51d65640c18beea7ad14ecdbd43aea1b5da0765 /pkgs/applications/graphics/cloudcompare | |
| parent | 739f0b22b74a35f65e5b862108db4d4380feecc8 (diff) | |
| download | nixpkgs-4f81a22f45437d7827497763821d89392e6a0c72.tar nixpkgs-4f81a22f45437d7827497763821d89392e6a0c72.tar.gz nixpkgs-4f81a22f45437d7827497763821d89392e6a0c72.tar.bz2 nixpkgs-4f81a22f45437d7827497763821d89392e6a0c72.tar.lz nixpkgs-4f81a22f45437d7827497763821d89392e6a0c72.tar.xz nixpkgs-4f81a22f45437d7827497763821d89392e6a0c72.tar.zst nixpkgs-4f81a22f45437d7827497763821d89392e6a0c72.zip | |
cloudcompare: Allow building with `pdal` 2.3.0
See https://github.com/CloudCompare/CloudCompare/pull/1478
Diffstat (limited to 'pkgs/applications/graphics/cloudcompare')
| -rw-r--r-- | pkgs/applications/graphics/cloudcompare/default.nix | 12 |
1 files changed, 11 insertions, 1 deletions
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 |