pcl: add wrapQt, remove broken and run nixpkgs-fmt

This commit is contained in:
storvik 2021-03-04 16:54:15 +01:00
parent cdca2809c0
commit 9c714b19ee
1 changed files with 37 additions and 11 deletions

View File

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