Skip to content

Commit c7e6aa5

Browse files
committed
rtabmap: move to by-name
1 parent 40f5f68 commit c7e6aa5

File tree

2 files changed

+4
-5
lines changed

2 files changed

+4
-5
lines changed

pkgs/applications/video/rtabmap/default.nix renamed to pkgs/by-name/rt/rtabmap/package.nix

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,14 @@
88
pcl,
99
libusb1,
1010
eigen,
11-
wrapQtAppsHook,
12-
qtbase,
1311
g2o,
1412
ceres-solver,
1513
zed-open-capture,
1614
hidapi,
1715
octomap,
1816
freenect,
1917
libdc1394,
18+
libsForQt5,
2019
libGL,
2120
libGLU,
2221
vtkWithQt5,
@@ -39,7 +38,7 @@ stdenv.mkDerivation rec {
3938
nativeBuildInputs = [
4039
cmake
4140
pkg-config
42-
wrapQtAppsHook
41+
libsForQt5.wrapQtAppsHook
4342
wrapGAppsHook3
4443
];
4544
buildInputs = [
@@ -61,7 +60,7 @@ stdenv.mkDerivation rec {
6160
freenect
6261
libdc1394
6362
# librealsense - missing includedir
64-
qtbase
63+
libsForQt5.qtbase
6564
libGL
6665
libGLU
6766
vtkWithQt5

pkgs/top-level/all-packages.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4780,7 +4780,7 @@ with pkgs;
47804780

47814781
rocket = libsForQt5.callPackage ../tools/graphics/rocket { };
47824782

4783-
rtabmap = libsForQt5.callPackage ../applications/video/rtabmap/default.nix {
4783+
rtabmap = callPackage ../by-name/rt/rtabmap/package.nix {
47844784
pcl = pcl.override { vtk = vtkWithQt5; };
47854785
};
47864786

0 commit comments

Comments
 (0)