pcl: misc cleanups (#373913)

This commit is contained in:
Gaétan Lepage 2025-05-18 23:49:42 +02:00 committed by GitHub
commit f11b80ca86
No known key found for this signature in database
GPG key ID: B5690EEEBB952194

View file

@ -41,6 +41,8 @@ stdenv.mkDerivation (finalAttrs: {
hash = "sha256-UCuQMWGwe+YxeGj0Y6m5IT58NW2lAWN5RqyZnvyFSr4="; hash = "sha256-UCuQMWGwe+YxeGj0Y6m5IT58NW2lAWN5RqyZnvyFSr4=";
}; };
strictDeps = true;
# remove attempt to prevent (x86/x87-specific) extended precision use # remove attempt to prevent (x86/x87-specific) extended precision use
# when SSE not detected # when SSE not detected
postPatch = lib.optionalString (!stdenv.hostPlatform.isx86) '' postPatch = lib.optionalString (!stdenv.hostPlatform.isx86) ''
@ -59,8 +61,7 @@ stdenv.mkDerivation (finalAttrs: {
libpcap libpcap
libsForQt5.qtbase libsForQt5.qtbase
libusb1 libusb1
llvmPackages.openmp ] ++ lib.optionals stdenv.cc.isClang [ llvmPackages.openmp ];
];
propagatedBuildInputs = [ propagatedBuildInputs = [
boost boost
@ -71,8 +72,11 @@ stdenv.mkDerivation (finalAttrs: {
vtk vtk
]; ];
cmakeFlags = lib.optionals cudaSupport [ cmakeFlags = [
(lib.cmakeBool "WITH_CUDA" true) (lib.cmakeBool "BUILD_CUDA" cudaSupport)
(lib.cmakeBool "BUILD_GPU" cudaSupport)
(lib.cmakeBool "PCL_ENABLE_MARCHNATIVE" false)
(lib.cmakeBool "WITH_CUDA" cudaSupport)
]; ];
passthru.updateScript = gitUpdater { passthru.updateScript = gitUpdater {