From fbc0670fbf667ffceced9e69506ad2215bcf4034 Mon Sep 17 00:00:00 2001 From: Mike Purvis Date: Tue, 29 Sep 2026 22:08:57 -0400 Subject: [PATCH] pcl: split dev output Assisted-by: Claude Code (Claude Opus 5.5) --- pkgs/by-name/pc/pcl/package.nix | 17 +++++++++++++++++ pkgs/by-name/rt/rtabmap/package.nix | 2 +- 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/pc/pcl/package.nix b/pkgs/by-name/pc/pcl/package.nix index 2b326ed73ff7..bcfbf2fd0ed0 100644 --- a/pkgs/by-name/pc/pcl/package.nix +++ b/pkgs/by-name/pc/pcl/package.nix @@ -43,6 +43,11 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-+KyaajJM0I5CAcr8AiOLC4TkGV3Gm73a0/X8LQWFZMI="; }; + outputs = [ + "out" + "dev" + ]; + patches = [ (fetchpatch { # see https://github.com/NixOS/nixpkgs/issues/485826 to be removed at next release after 1.15.1 @@ -86,6 +91,18 @@ stdenv.mkDerivation (finalAttrs: { vtk ]; + postInstall = '' + moveToOutput "share/pcl-*" "$dev" + ''; + + # PCLConfig.cmake is in dev and needs an absolute path back to the libraries + postFixup = '' + substituteInPlace "$dev"/share/pcl-*/PCLConfig.cmake \ + --replace-fail \ + 'set(PCL_LIBRARY_DIRS "''${PCL_ROOT}/lib")' \ + "set(PCL_LIBRARY_DIRS \"$out/lib\")" + ''; + cmakeFlags = [ (lib.cmakeBool "BUILD_CUDA" cudaSupport) (lib.cmakeBool "BUILD_GPU" cudaSupport) diff --git a/pkgs/by-name/rt/rtabmap/package.nix b/pkgs/by-name/rt/rtabmap/package.nix index b8dc6c2f8c95..cc1bb30d60bf 100644 --- a/pkgs/by-name/rt/rtabmap/package.nix +++ b/pkgs/by-name/rt/rtabmap/package.nix @@ -100,7 +100,7 @@ stdenv.mkDerivation (finalAttrs: { env.NIX_CFLAGS_COMPILE = "-Wno-c++20-extensions"; cmakeFlags = [ - (lib.cmakeFeature "CMAKE_INCLUDE_PATH" "${pcl'}/include/pcl-${lib.versions.majorMinor pcl'.version}") + (lib.cmakeFeature "CMAKE_INCLUDE_PATH" "${lib.getDev pcl'}/include/pcl-${lib.versions.majorMinor pcl'.version}") ]; passthru = {