@@ -1,22 +1,49 @@
1−{ lib, stdenv, fetchFromGitHub, cmake
2−, qhull, flann, boost, vtk, eigen, pkg-config, qtbase
3−, libusb1, libpcap, libXt, libpng, Cocoa, AGL, OpenGL
1+{ lib
2+, stdenv
3+, fetchFromGitHub
4+, wrapQtAppsHook
5+, cmake
6+, qhull
7+, flann
8+, boost
9+, vtk
10+, eigen
11+, pkg-config
12+, qtbase
13+, libusb1
14+, libpcap
15+, libXt
16+, libpng
17+, Cocoa
18+, AGL
19+, OpenGL
420}:
521
622stdenv.mkDerivation rec {
7− name = "pcl-1.11.1";
23+ pname = "pcl";
24+ version = "1.11.1";
825
926 src = fetchFromGitHub {
1027 owner = "PointCloudLibrary";
1128 repo = "pcl";
12− rev = name;
29+ rev = "${pname}-${version}";
1330 sha256 = "1cli2rxqsk6nxp36p5mgvvahjz8hm4fb68yi8cf9nw4ygbcvcwb1";
1431 };
1532
16− nativeBuildInputs = [ pkg-config cmake ];
17− buildInputs = [ qhull flann boost eigen libusb1 libpcap
18− libpng vtk qtbase libXt ]
19− ++ lib.optionals stdenv.isDarwin [ Cocoa AGL ];
33+ nativeBuildInputs = [ pkg-config cmake wrapQtAppsHook ];
34+ buildInputs = [
35+ qhull
36+ flann
37+ boost
38+ eigen
39+ libusb1
40+ libpcap
41+ libpng
42+ vtk
43+ qtbase
44+ libXt
45+ ]
46+ ++ lib.optionals stdenv.isDarwin [ Cocoa AGL ];
2047
2148 cmakeFlags = lib.optionals stdenv.isDarwin [
2249 "-DOPENGL_INCLUDE_DIR=${OpenGL}/Library/Frameworks"
@@ -24,10 +51,9 @@ stdenv.mkDerivation rec {
2451
2552 meta = {
2653 homepage = "https://pointclouds.org/";
27− broken = lib.versionAtLeast qtbase.version "5.15";
2854 description = "Open project for 2D/3D image and point cloud processing";
2955 license = lib.licenses.bsd3;
30− maintainers = with lib.maintainers; [viric];
56+ maintainers = with lib.maintainers; [ viric ];
3157 platforms = with lib.platforms; linux ++ darwin;
3258 };
3359}