From 7b313c3313ad595b4008244f6f20129cfcc8a14b Mon Sep 17 00:00:00 2001 From: qbisi Date: Thu, 4 Sep 2025 22:01:15 +0800 Subject: [PATCH] treewide: migrate pcl/rtabmap from qt5 to qt6 --- pkgs/by-name/pc/pcl/package.nix | 6 +++--- pkgs/by-name/rt/rtabmap/package.nix | 21 ++++++++++----------- pkgs/top-level/all-packages.nix | 4 ---- 3 files changed, 13 insertions(+), 18 deletions(-) diff --git a/pkgs/by-name/pc/pcl/package.nix b/pkgs/by-name/pc/pcl/package.nix index be11d204e41d..059c5938036d 100644 --- a/pkgs/by-name/pc/pcl/package.nix +++ b/pkgs/by-name/pc/pcl/package.nix @@ -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 ] diff --git a/pkgs/by-name/rt/rtabmap/package.nix b/pkgs/by-name/rt/rtabmap/package.nix index a8ac06b59150..51561509629c 100644 --- a/pkgs/by-name/rt/rtabmap/package.nix +++ b/pkgs/by-name/rt/rtabmap/package.nix @@ -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 = { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2c8d19e00e6d..9b189786308d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4037,10 +4037,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; };