dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #275314 from al3xtjames/pcl-cleanup

Browse Source 
pcl: minor cleanup & fix darwin build
This commit is contained in:
Weijia Wang 2023-12-22 03:41:15 +01:00 committed by GitHub
commit ca93cf6cb3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/development/libraries/pcl/default.nix
View File

@ -19,7 +19,7 @@
, AGL
, OpenGL
, config
, withCuda ? config.cudaSupport, cudaPackages
, cudaSupport ? config.cudaSupport, cudaPackages
}:
stdenv.mkDerivation rec {
@ -44,7 +44,7 @@ stdenv.mkDerivation rec {
cmake
wrapQtAppsHook
]
++ lib.optionals withCuda [ cudaPackages.cuda_nvcc ];
++ lib.optionals cudaSupport [ cudaPackages.cuda_nvcc ];
buildInputs = [
eigen
@ -66,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/";

3
pkgs/top-level/all-packages.nix
View File

@ -24497,7 +24497,8 @@ with pkgs;
pcg_c = callPackage ../development/libraries/pcg-c { };
pcl = libsForQt5.callPackage ../development/libraries/pcl {
inherit (darwin.apple_sdk.frameworks) Cocoa AGL OpenGL;
stdenv = if stdenv.isDarwin then darwin.apple_sdk_11_0.stdenv else stdenv;
inherit (darwin.apple_sdk_11_0.frameworks) Cocoa AGL OpenGL;
};
pcre = callPackage ../development/libraries/pcre { };