Merge pull request #275092 from al3xtjames/pcl-cudaPackages-update

pcl: fix configurePhase with withCuda=true
This commit is contained in:
Someone 2023-12-18 16:17:19 +00:00 committed by GitHub
commit 15bbf88b15
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -18,7 +18,8 @@
, Cocoa
, AGL
, OpenGL
, withCuda ? false, cudatoolkit
, config
, withCuda ? config.cudaSupport, cudaPackages
}:
stdenv.mkDerivation rec {
@ -38,7 +39,13 @@ stdenv.mkDerivation rec {
sed -i '/-ffloat-store/d' cmake/pcl_find_sse.cmake
'';
nativeBuildInputs = [ pkg-config cmake wrapQtAppsHook ];
nativeBuildInputs = [
pkg-config
cmake
wrapQtAppsHook
]
++ lib.optionals withCuda [ cudaPackages.cuda_nvcc ];
buildInputs = [
eigen
libusb1
@ -46,8 +53,7 @@ stdenv.mkDerivation rec {
qtbase
libXt
]
++ lib.optionals stdenv.isDarwin [ Cocoa AGL ]
++ lib.optionals withCuda [ cudatoolkit ];
++ lib.optionals stdenv.isDarwin [ Cocoa AGL ];
propagatedBuildInputs = [
boost