mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-12-01 19:33:03 +00:00
Merge pull request #137222 from mikepurvis/fix-pcl-propagation
pcl: 1.12.0 propagation fix
This commit is contained in:
commit
180425e5be
@ -12,6 +12,7 @@
|
|||||||
, qtbase
|
, qtbase
|
||||||
, libusb1
|
, libusb1
|
||||||
, libpcap
|
, libpcap
|
||||||
|
, libtiff
|
||||||
, libXt
|
, libXt
|
||||||
, libpng
|
, libpng
|
||||||
, Cocoa
|
, Cocoa
|
||||||
@ -33,20 +34,24 @@ stdenv.mkDerivation rec {
|
|||||||
|
|
||||||
nativeBuildInputs = [ pkg-config cmake wrapQtAppsHook ];
|
nativeBuildInputs = [ pkg-config cmake wrapQtAppsHook ];
|
||||||
buildInputs = [
|
buildInputs = [
|
||||||
qhull
|
|
||||||
flann
|
|
||||||
boost
|
|
||||||
eigen
|
eigen
|
||||||
libusb1
|
libusb1
|
||||||
libpcap
|
libpcap
|
||||||
libpng
|
|
||||||
vtk
|
|
||||||
qtbase
|
qtbase
|
||||||
libXt
|
libXt
|
||||||
]
|
]
|
||||||
++ lib.optionals stdenv.isDarwin [ Cocoa AGL ]
|
++ lib.optionals stdenv.isDarwin [ Cocoa AGL ]
|
||||||
++ lib.optionals withCuda [ cudatoolkit ];
|
++ lib.optionals withCuda [ cudatoolkit ];
|
||||||
|
|
||||||
|
propagatedBuildInputs = [
|
||||||
|
boost
|
||||||
|
flann
|
||||||
|
libpng
|
||||||
|
libtiff
|
||||||
|
qhull
|
||||||
|
vtk
|
||||||
|
];
|
||||||
|
|
||||||
cmakeFlags = lib.optionals stdenv.isDarwin [
|
cmakeFlags = lib.optionals stdenv.isDarwin [
|
||||||
"-DOPENGL_INCLUDE_DIR=${OpenGL}/Library/Frameworks"
|
"-DOPENGL_INCLUDE_DIR=${OpenGL}/Library/Frameworks"
|
||||||
] ++ lib.optionals withCuda [ "-DWITH_CUDA=true" ];
|
] ++ lib.optionals withCuda [ "-DWITH_CUDA=true" ];
|
||||||
|
Loading…
Reference in New Issue
Block a user