public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #30342 from acowley/pcl-qt5

Browse Source 
pcl: qt4 -> qt5; 1.8.0 -> 1.8.1
This commit is contained in:
Peter Hoeg 2017-10-14 14:00:42 +08:00 committed by GitHub
commit 2fdfefa2da
2 changed files with 8 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
pkgs/development/libraries/pcl/default.nix
View File

@ -1,34 +1,29 @@
{ stdenv, fetchFromGitHub, cmake, qhull, flann, boost, vtk, eigen, pkgconfig, qt4 { stdenv, fetchFromGitHub, cmake, qhull, flann, boost, vtk, eigen, pkgconfig, qtbase
, libusb1, libpcap, libXt, libpng, Cocoa, AGL, cf-private, OpenGL , libusb1, libpcap, libXt, libpng, Cocoa, AGL, cf-private, OpenGL
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "pcl-1.8.0"; name = "pcl-1.8.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "PointCloudLibrary"; owner = "PointCloudLibrary";
repo = "pcl"; repo = "pcl";
rev = name; rev = name;
sha256 = "1pki4y7mc2dryxc8wa7rs4hg74qab80rpy90jnw3j8fzf09kxcll"; sha256 = "05wvqqi2fyk5innw4mg356r71c1hmc9alc7xkf4g81ds3b3867xq";
}; };
enableParallelBuilding = true; enableParallelBuilding = true;
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig cmake ];
buildInputs = [ cmake qhull flann boost eigen libusb1 libpcap buildInputs = [ qhull flann boost eigen libusb1 libpcap
libpng vtk qt4 libXt ] libpng vtk qtbase libXt ]
++ stdenv.lib.optionals stdenv.isDarwin [ Cocoa AGL cf-private ]; ++ stdenv.lib.optionals stdenv.isDarwin [ Cocoa AGL cf-private ];
cmakeFlags = stdenv.lib.optionals stdenv.isDarwin [ cmakeFlags = stdenv.lib.optionals stdenv.isDarwin [
"-DCMAKE_OSX_SYSROOT=" "-DCMAKE_OSX_DEPLOYMENT_TARGET=" "-DCMAKE_OSX_SYSROOT=" "-DCMAKE_OSX_DEPLOYMENT_TARGET="
"-DOPENGL_INCLUDE_DIR=${OpenGL}/Library/Frameworks" "-DOPENGL_INCLUDE_DIR=${OpenGL}/Library/Frameworks"
]; ];
preConfigure = stdenv.lib.optionalString stdenv.isDarwin ''
NIX_CFLAGS_COMPILE=$(echo "$NIX_CFLAGS_COMPILE" | sed "s,[[:space:]]*-F$NIX_STORE/[[:alnum:]]*-CF-osx-[[:digit:].]*/Library/Frameworks,,g")
sed -i 's,^\( target_link_libraries("''${LIB_NAME}" "-framework Cocoa")\),\1\n target_link_libraries("''${LIB_NAME}" "/System/Library/Frameworks/CoreFoundation.framework/Versions/A/CoreFoundation"),' visualization/CMakeLists.txt
sed -i 's,^\(set(SUBSYS_DEPS common io kdtree geometry search)\),\1\nset(CMAKE_OSX_SYSROOT "")\nset(CMAKE_OSX_DEPLOYMENT_TARGET ""),' visualization/CMakeLists.txt
'';
meta = { meta = {
homepage = http://pointclouds.org/; homepage = http://pointclouds.org/;
description = "Open project for 2D/3D image and point cloud processing"; description = "Open project for 2D/3D image and point cloud processing";

3
pkgs/top-level/all-packages.nix
View File

@ -10104,8 +10104,7 @@ with pkgs;
pcg_c = callPackage ../development/libraries/pcg-c { }; pcg_c = callPackage ../development/libraries/pcg-c { };
pcl = callPackage ../development/libraries/pcl { pcl = libsForQt5.callPackage ../development/libraries/pcl {
vtk = vtkWithQt4;
inherit (darwin) cf-private; inherit (darwin) cf-private;
inherit (darwin.apple_sdk.frameworks) Cocoa AGL OpenGL; inherit (darwin.apple_sdk.frameworks) Cocoa AGL OpenGL;
}; };