pyrox.dev
Merge pull request #167055 from tpwrules/upgrade-cloudcompare
+45
-12
pkgs/applications/graphics/cloudcompare/default.nix
+45
-12
pkgs/applications/graphics/cloudcompare/default.nix
···
1
1
{ lib
2
2
, mkDerivation
3
3
, fetchFromGitHub
4
+
, fetchpatch
4
5
, cmake
5
-
, dxflib
6
+
, boost
7
+
, cgal_5
6
8
, eigen
7
9
, flann
8
10
, gdal
11
+
, gmp
9
12
, LASzip
10
-
, libLAS
13
+
, mpfr
11
14
, pdal
12
15
, pcl
13
16
, qtbase
···
15
18
, qttools
16
19
, tbb
17
20
, xercesc
21
+
, wrapGAppsHook
18
22
}:
19
23
20
24
mkDerivation rec {
21
25
pname = "cloudcompare";
22
-
# Released version(v2.11.3) doesn't work with packaged PCL.
23
-
version = "unstable-2021-10-14";
26
+
version = "2.12.0";
24
27
25
28
src = fetchFromGitHub {
26
29
owner = "CloudCompare";
27
30
repo = "CloudCompare";
28
-
rev = "1f65ba63756e23291ae91ff52d04da468ade8249";
29
-
sha256 = "x1bDjFjXIl3r+yo1soWvRB+4KGP50/WBoGlrH013JQo=";
30
-
# As of writing includes (https://github.com/CloudCompare/CloudCompare/blob/a1c589c006fc325e8b560c77340809b9c7e7247a/.gitmodules):
31
-
# * libE57Format
32
-
# * PoissonRecon
33
-
# * CCCoreLib
31
+
rev = "v${version}";
32
+
sha256 = "sha256-hu3ckVocExi9lvxelHAwKb/MZacH4CcCE+vIzElgP/A=";
34
33
fetchSubmodules = true;
35
34
};
36
35
36
+
patches = [
37
+
# fix issues compiling on aarch64. remove once upgraded past 2.12.0
38
+
(fetchpatch {
39
+
url = "https://github.com/CloudCompare/CloudCompare/commit/7e71861fdbd6ea704add5ba69343f47d8fc3d5ae.patch";
40
+
sha256 = "sha256-CRUPjxtKUbsqOyYsjKF+dRZ+E3rqrv5mS3ZaOay2wk8=";
41
+
})
42
+
];
43
+
37
44
nativeBuildInputs = [
38
45
cmake
39
46
eigen # header-only
47
+
wrapGAppsHook
40
48
];
41
49
42
50
buildInputs = [
43
-
dxflib
51
+
boost
52
+
cgal_5
44
53
flann
45
54
gdal
55
+
gmp
46
56
LASzip
47
-
libLAS
57
+
mpfr
48
58
pdal
49
59
pcl
50
60
qtbase
···
72
82
"-DPLUGIN_IO_QPHOTOSCAN=ON"
73
83
"-DPLUGIN_IO_QRDB=OFF" # Riegl rdblib is proprietary; not packaged in nixpkgs
74
84
85
+
"-DCCCORELIB_USE_CGAL=ON" # enables Delauney triangulation support
75
86
"-DPLUGIN_STANDARD_QPCL=ON" # Adds PCD import and export support
87
+
"-DPLUGIN_STANDARD_QANIMATION=ON"
88
+
"-DPLUGIN_STANDARD_QBROOM=ON"
89
+
"-DPLUGIN_STANDARD_QCANUPO=ON"
90
+
"-DPLUGIN_STANDARD_QCOMPASS=ON"
91
+
"-DPLUGIN_STANDARD_QCSF=ON"
92
+
"-DPLUGIN_STANDARD_QFACETS=ON"
93
+
"-DPLUGIN_STANDARD_QHOUGH_NORMALS=ON"
94
+
"-DEIGEN_ROOT_DIR=${eigen}/include/eigen3" # needed for hough normals
95
+
"-DPLUGIN_STANDARD_QHPR=ON"
96
+
"-DPLUGIN_STANDARD_QM3C2=ON"
97
+
"-DPLUGIN_STANDARD_QMPLANE=ON"
98
+
"-DPLUGIN_STANDARD_QPOISSON_RECON=ON"
99
+
"-DPLUGIN_STANDARD_QRANSAC_SD=ON"
100
+
"-DPLUGIN_STANDARD_QSRA=ON"
101
+
"-DPLUGIN_STANDARD_QCLOUDLAYERS=ON"
76
102
];
103
+
104
+
dontWrapGApps = true;
105
+
106
+
# fix file dialogs crashing on non-NixOS (and avoid double wrapping)
107
+
preFixup = ''
108
+
qtWrapperArgs+=("''${gappsWrapperArgs[@]}")
109
+
'';
77
110
78
111
meta = with lib; {
79
112
description = "3D point cloud and mesh processing software";