diff --git a/pkgs/development/libraries/pcl/default.nix b/pkgs/development/libraries/pcl/default.nix index 436e0f85e162..b8cdff1f48c8 100644 --- a/pkgs/development/libraries/pcl/default.nix +++ b/pkgs/development/libraries/pcl/default.nix @@ -1,22 +1,49 @@ -{ lib, stdenv, fetchFromGitHub, cmake -, qhull, flann, boost, vtk, eigen, pkg-config, qtbase -, libusb1, libpcap, libXt, libpng, Cocoa, AGL, OpenGL +{ lib +, stdenv +, fetchFromGitHub +, wrapQtAppsHook +, cmake +, qhull +, flann +, boost +, vtk +, eigen +, pkg-config +, qtbase +, libusb1 +, libpcap +, libXt +, libpng +, Cocoa +, AGL +, OpenGL }: stdenv.mkDerivation rec { - name = "pcl-1.11.1"; + pname = "pcl"; + version = "1.11.1"; src = fetchFromGitHub { owner = "PointCloudLibrary"; repo = "pcl"; - rev = name; + rev = "${pname}-${version}"; sha256 = "1cli2rxqsk6nxp36p5mgvvahjz8hm4fb68yi8cf9nw4ygbcvcwb1"; }; - nativeBuildInputs = [ pkg-config cmake ]; - buildInputs = [ qhull flann boost eigen libusb1 libpcap - libpng vtk qtbase libXt ] - ++ lib.optionals stdenv.isDarwin [ Cocoa AGL ]; + nativeBuildInputs = [ pkg-config cmake wrapQtAppsHook ]; + buildInputs = [ + qhull + flann + boost + eigen + libusb1 + libpcap + libpng + vtk + qtbase + libXt + ] + ++ lib.optionals stdenv.isDarwin [ Cocoa AGL ]; cmakeFlags = lib.optionals stdenv.isDarwin [ "-DOPENGL_INCLUDE_DIR=${OpenGL}/Library/Frameworks" @@ -24,10 +51,9 @@ stdenv.mkDerivation rec { meta = { homepage = "https://pointclouds.org/"; - broken = lib.versionAtLeast qtbase.version "5.15"; description = "Open project for 2D/3D image and point cloud processing"; license = lib.licenses.bsd3; - maintainers = with lib.maintainers; [viric]; + maintainers = with lib.maintainers; [ viric ]; platforms = with lib.platforms; linux ++ darwin; }; }