pyrox.dev
meshlab: 2020.07 -> 2020.12
+7
-21
pkgs/applications/graphics/meshlab/default.nix
+7
-21
pkgs/applications/graphics/meshlab/default.nix
···
1
1
{ mkDerivation
2
2
, lib
3
3
, fetchFromGitHub
4
-
, fetchpatch
5
4
, libGLU
6
5
, qtbase
7
6
, qtscript
···
19
18
20
19
mkDerivation rec {
21
20
pname = "meshlab";
22
-
version = "2020.07";
21
+
version = "2020.12";
23
22
24
23
src = fetchFromGitHub {
25
24
owner = "cnr-isti-vclab";
26
25
repo = "meshlab";
27
26
rev = "Meshlab-${version}";
28
-
sha256 = "0vj849b57zk3k6lx35zzcjhr9gdy4hxqnnkb8chwy7hw262cm3ri";
27
+
sha256 = "QrnqXEVqI1ADUYWalZ0h/0+xS+gDZTinm0weT39onw0=";
29
28
fetchSubmodules = true; # for vcglib
30
29
};
31
30
···
46
45
47
46
nativeBuildInputs = [ cmake ];
48
47
49
-
patches = [
50
-
# Make cmake use the system qhull. The next meshlab will not need this patch because it is already in master.
51
-
(fetchpatch {
52
-
url = "https://patch-diff.githubusercontent.com/raw/cnr-isti-vclab/meshlab/pull/747.patch";
53
-
sha256 = "0wx9f6zn458xz3lsqcgvsbwh1pgi3g0lah93nlbsb0sagng7n565";
54
-
})
55
-
];
56
-
57
48
preConfigure = ''
58
-
substituteAll ${./meshlab.desktop} install/linux/resources/meshlab.desktop
59
-
cd src
49
+
substituteAll ${./meshlab.desktop} scripts/Linux/resources/meshlab.desktop
50
+
cmakeDir=$PWD/src
51
+
mkdir ../build
52
+
cd ../build
60
53
'';
61
54
62
55
cmakeFlags = [
···
75
68
76
69
postFixup = ''
77
70
patchelf --add-needed $out/lib/meshlab/libmeshlab-common.so $out/bin/.meshlab-wrapped
78
-
patchelf --add-needed $out/lib/meshlab/libmeshlab-common.so $out/bin/.meshlabserver-wrapped
79
71
'';
80
72
81
-
# Meshlab is not format-security clean; without disabling hardening, we get:
82
-
# src/common/GLLogStream.h:61:37: error: format not a string literal and no format arguments [-Werror=format-security]
83
-
# 61 | int chars_written = snprintf(buf, buf_size, f, std::forward<Ts>(ts)...);
84
-
# |
85
-
hardeningDisable = [ "format" ];
86
-
87
73
meta = {
88
74
description = "A system for processing and editing 3D triangular meshes";
89
75
homepage = "https://www.meshlab.net/";
90
-
license = lib.licenses.gpl3;
76
+
license = lib.licenses.gpl3Only;
91
77
maintainers = with lib.maintainers; [ viric ];
92
78
platforms = with lib.platforms; linux;
93
79
};