treewide: migrate pcl/rtabmap from qt5 to qt6 (#440182)

This commit is contained in:
Gaétan Lepage
2025-09-04 23:11:23 +02:00
committed by GitHub
3 changed files with 13 additions and 18 deletions
+3 -3
View File
@@ -6,7 +6,7 @@
# nativeBuildInputs
cmake,
libsForQt5,
qt6,
pkg-config,
# buildInputs
@@ -52,7 +52,7 @@ stdenv.mkDerivation (finalAttrs: {
nativeBuildInputs = [
cmake
libsForQt5.wrapQtAppsHook
qt6.wrapQtAppsHook
pkg-config
]
++ lib.optionals cudaSupport [ cudaPackages.cuda_nvcc ];
@@ -61,7 +61,7 @@ stdenv.mkDerivation (finalAttrs: {
eigen
libXt
libpcap
libsForQt5.qtbase
qt6.qtbase
libusb1
nanoflann
]
+10 -11
View File
@@ -6,7 +6,7 @@
# nativeBuildInputs
cmake,
libsForQt5,
qt6,
pkg-config,
wrapGAppsHook3,
@@ -28,14 +28,16 @@
libGL,
libGLU,
librealsense,
vtkWithQt5,
vtkWithQt6,
zed-open-capture,
hidapi,
# passthru
gitUpdater,
}:
let
pcl' = pcl.override { vtk = vtkWithQt6; };
in
stdenv.mkDerivation (finalAttrs: {
pname = "rtabmap";
version = "0.22.1";
@@ -49,7 +51,7 @@ stdenv.mkDerivation (finalAttrs: {
nativeBuildInputs = [
cmake
libsForQt5.wrapQtAppsHook
qt6.wrapQtAppsHook
pkg-config
wrapGAppsHook3
];
@@ -57,7 +59,7 @@ stdenv.mkDerivation (finalAttrs: {
## Required
opencv
opencv.cxxdev
pcl
pcl'
liblapack
xorg.libSM
xorg.libICE
@@ -75,21 +77,18 @@ stdenv.mkDerivation (finalAttrs: {
freenect
libdc1394
librealsense
libsForQt5.qtbase
qt6.qtbase
libGL
libGLU
vtkWithQt5
zed-open-capture
hidapi
];
# Configure environment variables
NIX_CFLAGS_COMPILE = "-Wno-c++20-extensions -I${vtkWithQt5}/include/vtk";
NIX_CFLAGS_COMPILE = "-Wno-c++20-extensions";
cmakeFlags = [
(lib.cmakeFeature "VTK_QT_VERSION" "5")
(lib.cmakeFeature "VTK_DIR" "${vtkWithQt5}/lib/cmake/vtk-${lib.versions.majorMinor vtkWithQt5.version}")
(lib.cmakeFeature "CMAKE_INCLUDE_PATH" "${vtkWithQt5}/include/vtk:${pcl}/include/pcl-${lib.versions.majorMinor pcl.version}")
(lib.cmakeFeature "CMAKE_INCLUDE_PATH" "${pcl'}/include/pcl-${lib.versions.majorMinor pcl'.version}")
];
passthru = {
-4
View File
@@ -4031,10 +4031,6 @@ with pkgs;
rocket = libsForQt5.callPackage ../tools/graphics/rocket { };
rtabmap = callPackage ../by-name/rt/rtabmap/package.nix {
pcl = pcl.override { vtk = vtkWithQt5; };
};
rtaudio = callPackage ../development/libraries/audio/rtaudio {
jack = libjack2;
};