nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-30 10:53:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

cloudcompare: Allow building with pdal 2.3.0

Browse Source 
See https://github.com/CloudCompare/CloudCompare/pull/1478
This commit is contained in:
Niklas Hambüchen 2021-08-17 19:56:17 +02:00
parent 739f0b22b7
commit 4f81a22f45
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkgs/applications/graphics/cloudcompare/default.nix
View File

@ -1,6 +1,7 @@
{ lib { lib
, mkDerivation , mkDerivation
, fetchFromGitHub , fetchFromGitHub
, fetchpatch
, cmake , cmake
, dxflib , dxflib
, eigen , eigen
@ -18,7 +19,7 @@
mkDerivation rec { mkDerivation rec {
pname = "cloudcompare"; pname = "cloudcompare";
version = "2.11.2"; version = "2.11.2"; # Remove below patch with the next version bump.
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "CloudCompare"; owner = "CloudCompare";
@ -33,6 +34,15 @@ mkDerivation rec {
fetchSubmodules = true; 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 = [ nativeBuildInputs = [
cmake cmake
eigen # header-only eigen # header-only