diff options
| author | Someone <sergei.kozlukov@aalto.fi> | 2023-12-18 16:17:19 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-12-18 16:17:19 +0000 |
| commit | 15bbf88b15f9367fbffab28efb9318b5193e8f51 (patch) | |
| tree | accb6f110e1b42772858bd792aac23f919773ac1 /pkgs/development/libraries | |
| parent | 9478d01e1f6b067f4a18092b3c6eafcbe839cd1c (diff) | |
| parent | 8db5a1a6b911cf32e95cdb351a6aeab1812fc7b6 (diff) | |
Merge pull request #275092 from al3xtjames/pcl-cudaPackages-update
pcl: fix configurePhase with withCuda=true
Diffstat (limited to 'pkgs/development/libraries')
| -rw-r--r-- | pkgs/development/libraries/pcl/default.nix | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/pkgs/development/libraries/pcl/default.nix b/pkgs/development/libraries/pcl/default.nix index 635422fd9b99..31198124faac 100644 --- a/pkgs/development/libraries/pcl/default.nix +++ b/pkgs/development/libraries/pcl/default.nix @@ -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 |