diff options
| author | Alyssa Ross <hi@alyssa.is> | 2021-09-13 11:53:06 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2021-09-13 17:18:49 +0000 |
| commit | c3e005913d59b8ad64004e60888a71816688af1f (patch) | |
| tree | f65b32f0d16acaa40f2ee82ac736d150de4b6cf5 /nixpkgs/pkgs/development/libraries/pcl | |
| parent | 1c8034da05499ca3d999f57ba1f6b235e7711ee1 (diff) | |
| parent | db88608d8c811a93b74c99cfa1224952afc78200 (diff) | |
| download | nixlib-c3e005913d59b8ad64004e60888a71816688af1f.tar nixlib-c3e005913d59b8ad64004e60888a71816688af1f.tar.gz nixlib-c3e005913d59b8ad64004e60888a71816688af1f.tar.bz2 nixlib-c3e005913d59b8ad64004e60888a71816688af1f.tar.lz nixlib-c3e005913d59b8ad64004e60888a71816688af1f.tar.xz nixlib-c3e005913d59b8ad64004e60888a71816688af1f.tar.zst nixlib-c3e005913d59b8ad64004e60888a71816688af1f.zip | |
Merge commit 'db88608d8c811a93b74c99cfa1224952afc78200'
Conflicts: nixpkgs/nixos/modules/config/update-users-groups.pl
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/pcl')
| -rw-r--r-- | nixpkgs/pkgs/development/libraries/pcl/default.nix | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/nixpkgs/pkgs/development/libraries/pcl/default.nix b/nixpkgs/pkgs/development/libraries/pcl/default.nix index d940d0518155..ee8f4dfe2e0a 100644 --- a/nixpkgs/pkgs/development/libraries/pcl/default.nix +++ b/nixpkgs/pkgs/development/libraries/pcl/default.nix @@ -12,6 +12,7 @@ , qtbase , libusb1 , libpcap +, libtiff , libXt , libpng , Cocoa @@ -33,20 +34,24 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config cmake wrapQtAppsHook ]; buildInputs = [ - qhull - flann - boost eigen libusb1 libpcap - libpng - vtk qtbase libXt ] ++ lib.optionals stdenv.isDarwin [ Cocoa AGL ] ++ lib.optionals withCuda [ cudatoolkit ]; + propagatedBuildInputs = [ + boost + flann + libpng + libtiff + qhull + vtk + ]; + cmakeFlags = lib.optionals stdenv.isDarwin [ "-DOPENGL_INCLUDE_DIR=${OpenGL}/Library/Frameworks" ] ++ lib.optionals withCuda [ "-DWITH_CUDA=true" ]; |