commit ad4550c725ef12fd76e2109209f2c0043fc96098 · pyrox.dev/nixpkgs

+3 -3

pkgs/by-name/pc/pcl/package.nix

···

       6
       6
        
       

     

       7
       7
        
         # nativeBuildInputs

     

       8
       8
        
         cmake,

     

       9
       9
       -
         libsForQt5,

     

       9
       9
       +
         qt6,

     

       10
       10
        
         pkg-config,

     

       11
       11
        
       

     

       12
       12
        
         # buildInputs

     
···

       52
       52
        
       

     

       53
       53
        
         nativeBuildInputs = [

     

       54
       54
        
           cmake

     

       55
       55
       -
           libsForQt5.wrapQtAppsHook

     

       55
       55
       +
           qt6.wrapQtAppsHook

     

       56
       56
        
           pkg-config

     

       57
       57
        
         ]

     

       58
       58
        
         ++ lib.optionals cudaSupport [ cudaPackages.cuda_nvcc ];

     
···

       61
       61
        
           eigen

     

       62
       62
        
           libXt

     

       63
       63
        
           libpcap

     

       64
       64
       -
           libsForQt5.qtbase

     

       64
       64
       +
           qt6.qtbase

     

       65
       65
        
           libusb1

     

       66
       66
        
           nanoflann

     

       67
       67
        
         ]

+10 -11

pkgs/by-name/rt/rtabmap/package.nix

···

       6
       6
        
       

     

       7
       7
        
         # nativeBuildInputs

     

       8
       8
        
         cmake,

     

       9
       9
       -
         libsForQt5,

     

       9
       9
       +
         qt6,

     

       10
       10
        
         pkg-config,

     

       11
       11
        
         wrapGAppsHook3,

     

       12
       12
        
       

     
···

       28
       28
        
         libGL,

     

       29
       29
        
         libGLU,

     

       30
       30
        
         librealsense,

     

       31
       31
       -
         vtkWithQt5,

     

       31
       31
       +
         vtkWithQt6,

     

       32
       32
        
         zed-open-capture,

     

       33
       33
        
         hidapi,

     

       34
       34
        
       

     

       35
       35
        
         # passthru

     

       36
       36
        
         gitUpdater,

     

       37
       37
        
       }:

     

       38
       38
       -
       

     

       38
       38
       +
       let

     

       39
       39
       +
         pcl' = pcl.override { vtk = vtkWithQt6; };

     

       40
       40
       +
       in

     

       39
       41
        
       stdenv.mkDerivation (finalAttrs: {

     

       40
       42
        
         pname = "rtabmap";

     

       41
       43
        
         version = "0.22.1";

     
···

       49
       51
        
       

     

       50
       52
        
         nativeBuildInputs = [

     

       51
       53
        
           cmake

     

       52
       52
       -
           libsForQt5.wrapQtAppsHook

     

       54
       54
       +
           qt6.wrapQtAppsHook

     

       53
       55
        
           pkg-config

     

       54
       56
        
           wrapGAppsHook3

     

       55
       57
        
         ];

     
···

       57
       59
        
           ## Required

     

       58
       60
        
           opencv

     

       59
       61
        
           opencv.cxxdev

     

       60
       60
       -
           pcl

     

       62
       62
       +
           pcl'

     

       61
       63
        
           liblapack

     

       62
       64
        
           xorg.libSM

     

       63
       65
        
           xorg.libICE

     
···

       75
       77
        
           freenect

     

       76
       78
        
           libdc1394

     

       77
       79
        
           librealsense

     

       78
       78
       -
           libsForQt5.qtbase

     

       80
       80
       +
           qt6.qtbase

     

       79
       81
        
           libGL

     

       80
       82
        
           libGLU

     

       81
       81
       -
           vtkWithQt5

     

       82
       83
        
           zed-open-capture

     

       83
       84
        
           hidapi

     

       84
       85
        
         ];

     

       85
       86
        
       

     

       86
       87
        
         # Configure environment variables

     

       87
       87
       -
         NIX_CFLAGS_COMPILE = "-Wno-c++20-extensions -I${vtkWithQt5}/include/vtk";

     

       88
       88
       +
         NIX_CFLAGS_COMPILE = "-Wno-c++20-extensions";

     

       88
       89
        
       

     

       89
       90
        
         cmakeFlags = [

     

       90
       90
       -
           (lib.cmakeFeature "VTK_QT_VERSION" "5")

     

       91
       91
       -
           (lib.cmakeFeature "VTK_DIR" "${vtkWithQt5}/lib/cmake/vtk-${lib.versions.majorMinor vtkWithQt5.version}")

     

       92
       92
       -
           (lib.cmakeFeature "CMAKE_INCLUDE_PATH" "${vtkWithQt5}/include/vtk:${pcl}/include/pcl-${lib.versions.majorMinor pcl.version}")

     

       91
       91
       +
           (lib.cmakeFeature "CMAKE_INCLUDE_PATH" "${pcl'}/include/pcl-${lib.versions.majorMinor pcl'.version}")

     

       93
       92
        
         ];

     

       94
       93
        
       

     

       95
       94
        
         passthru = {

-4

pkgs/top-level/all-packages.nix

···

       4031
       4031
        
       

     

       4032
       4032
        
         rocket = libsForQt5.callPackage ../tools/graphics/rocket { };

     

       4033
       4033
        
       

     

       4034
       4034
       -
         rtabmap = callPackage ../by-name/rt/rtabmap/package.nix {

     

       4035
       4035
       -
           pcl = pcl.override { vtk = vtkWithQt5; };

     

       4036
       4036
       -
         };

     

       4037
       4037
       -
       

     

       4038
       4034
        
         rtaudio = callPackage ../development/libraries/audio/rtaudio {

     

       4039
       4035
        
           jack = libjack2;

     

       4040
       4036
        
         };