diff options
| author | Sandro <sandro.jaeckel@gmail.com> | 2021-09-11 21:09:19 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-11 21:09:19 +0200 |
| commit | 180425e5be4c2e47800bba016d01c193fae1882d (patch) | |
| tree | 6b17dfefdf5530e1589e213a7c2ddc19936a482e /pkgs/development | |
| parent | 2dd30ffb9999118773d5ba44aa7395779500c322 (diff) | |
| parent | ed4e0e942ea0f2a06feacaba76532651dfcaf157 (diff) | |
Merge pull request #137222 from mikepurvis/fix-pcl-propagation
pcl: 1.12.0 propagation fix
Diffstat (limited to 'pkgs/development')
| -rw-r--r-- | pkgs/development/libraries/pcl/default.nix | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/pkgs/development/libraries/pcl/default.nix b/pkgs/development/libraries/pcl/default.nix index d940d0518155c..ee8f4dfe2e0ae 100644 --- a/pkgs/development/libraries/pcl/default.nix +++ b/pkgs/development/libraries/pcl/default.nix @@ -12,6 +12,7 @@ , qtbase , libusb1 , libpcap +, libtiff , libXt , libpng , Cocoa @@ -33,20 +34,24 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config cmake wrapQtAppsHook ]; buildInputs = [ - qhull - flann - boost eigen libusb1 libpcap - libpng - vtk qtbase libXt ] ++ lib.optionals stdenv.isDarwin [ Cocoa AGL ] ++ lib.optionals withCuda [ cudatoolkit ]; + propagatedBuildInputs = [ + boost + flann + libpng + libtiff + qhull + vtk + ]; + cmakeFlags = lib.optionals stdenv.isDarwin [ "-DOPENGL_INCLUDE_DIR=${OpenGL}/Library/Frameworks" ] ++ lib.optionals withCuda [ "-DWITH_CUDA=true" ]; |