diff options
| author | Alyssa Ross <hi@alyssa.is> | 2024-01-06 02:12:23 +0100 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2024-01-06 02:12:23 +0100 |
| commit | f34a1b70eb86e4a63cfb88ea460345bb1aed88e3 (patch) | |
| tree | 32834d23912250e0c4b86aa4420baacf8091c0fe /nixpkgs/pkgs/development/libraries/pcl | |
| parent | 003ab91dd67b093890db1dd0bab564345db6e496 (diff) | |
| parent | 7a7cfff8915e06365bc2365ff33d4d413184fa9f (diff) | |
| download | nixlib-f34a1b70eb86e4a63cfb88ea460345bb1aed88e3.tar nixlib-f34a1b70eb86e4a63cfb88ea460345bb1aed88e3.tar.gz nixlib-f34a1b70eb86e4a63cfb88ea460345bb1aed88e3.tar.bz2 nixlib-f34a1b70eb86e4a63cfb88ea460345bb1aed88e3.tar.lz nixlib-f34a1b70eb86e4a63cfb88ea460345bb1aed88e3.tar.xz nixlib-f34a1b70eb86e4a63cfb88ea460345bb1aed88e3.tar.zst nixlib-f34a1b70eb86e4a63cfb88ea460345bb1aed88e3.zip | |
Merge branch 'nixos-unstable-small' of https://github.com/NixOS/nixpkgs
Conflicts: nixpkgs/pkgs/build-support/go/module.nix
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/pcl')
| -rw-r--r-- | nixpkgs/pkgs/development/libraries/pcl/default.nix | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/nixpkgs/pkgs/development/libraries/pcl/default.nix b/nixpkgs/pkgs/development/libraries/pcl/default.nix index 635422fd9b99..624ca4aa6672 100644 --- a/nixpkgs/pkgs/development/libraries/pcl/default.nix +++ b/nixpkgs/pkgs/development/libraries/pcl/default.nix @@ -18,7 +18,8 @@ , Cocoa , AGL , OpenGL -, withCuda ? false, cudatoolkit +, config +, cudaSupport ? 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 cudaSupport [ 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 @@ -60,7 +66,7 @@ stdenv.mkDerivation rec { cmakeFlags = lib.optionals stdenv.isDarwin [ "-DOPENGL_INCLUDE_DIR=${OpenGL}/Library/Frameworks" - ] ++ lib.optionals withCuda [ "-DWITH_CUDA=true" ]; + ] ++ lib.optionals cudaSupport [ "-DWITH_CUDA=true" ]; meta = { homepage = "https://pointclouds.org/"; |