Merge pull request #115097 from storvik/pcl

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

authored by Sandro and committed by GitHub 6aa26c86 482bade1

+37 -11
+37 -11
pkgs/development/libraries/pcl/default.nix
··· 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 4 20 }: 5 21 6 22 stdenv.mkDerivation rec { 7 - name = "pcl-1.11.1"; 23 + pname = "pcl"; 24 + version = "1.11.1"; 8 25 9 26 src = fetchFromGitHub { 10 27 owner = "PointCloudLibrary"; 11 28 repo = "pcl"; 12 - rev = name; 29 + rev = "${pname}-${version}"; 13 30 sha256 = "1cli2rxqsk6nxp36p5mgvvahjz8hm4fb68yi8cf9nw4ygbcvcwb1"; 14 31 }; 15 32 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 ]; 20 47 21 48 cmakeFlags = lib.optionals stdenv.isDarwin [ 22 49 "-DOPENGL_INCLUDE_DIR=${OpenGL}/Library/Frameworks" ··· 24 51 25 52 meta = { 26 53 homepage = "https://pointclouds.org/"; 27 - broken = lib.versionAtLeast qtbase.version "5.15"; 28 54 description = "Open project for 2D/3D image and point cloud processing"; 29 55 license = lib.licenses.bsd3; 30 - maintainers = with lib.maintainers; [viric]; 56 + maintainers = with lib.maintainers; [ viric ]; 31 57 platforms = with lib.platforms; linux ++ darwin; 32 58 }; 33 59 }