diff options
| author | Ben Wolsieffer <benwolsieffer@gmail.com> | 2023-08-18 15:20:20 -0400 |
|---|---|---|
| committer | Ben Wolsieffer <benwolsieffer@gmail.com> | 2023-08-18 15:20:20 -0400 |
| commit | 78fd6b41368e404f87b504f85e5c1f2c494bc9b5 (patch) | |
| tree | ce19a4234080e3ff34d4b33fe0b7911432983328 /pkgs/applications/video/rtabmap | |
| parent | 0ba4d72c554405ac693c472e23cff1d28d352dc1 (diff) | |
rtabmap: add patches to fix build with g2o 20230806
These patches are from upstream but are not part of a standard release yet. There are ROS specific release tags for 0.21.1 (0.21.1-iron, 0.21.1-humble, etc.), but no regular release, so I chose the more conservative route and backported the patches.
Diffstat (limited to 'pkgs/applications/video/rtabmap')
| -rw-r--r-- | pkgs/applications/video/rtabmap/default.nix | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/pkgs/applications/video/rtabmap/default.nix b/pkgs/applications/video/rtabmap/default.nix index ecfd8a676bcaf..200fab2743396 100644 --- a/pkgs/applications/video/rtabmap/default.nix +++ b/pkgs/applications/video/rtabmap/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, fetchpatch , pkg-config , cmake , opencv @@ -35,6 +36,19 @@ stdenv.mkDerivation rec { hash = "sha256-1xb8O3VrErldid2OgAUMG28mSUO7QBUsPuSz8p03tSI"; }; + patches = [ + # Fix build with g2o 20230806 + (fetchpatch { + url = "https://github.com/introlab/rtabmap/commit/85cc6fe3c742855ad16c8442895e12dbb10b6e8b.patch"; + hash = "sha256-P6GkYKCNwe9dgZdgF/oEhgjA3bJnwXFWJCPoyIknQCo="; + }) + # Fix typo in previous patch + (fetchpatch { + url = "https://github.com/introlab/rtabmap/commit/c4e94bcdc31b859c1049724dbb7671e4597d86de.patch"; + hash = "sha256-1btkV4/y+bnF3xEVqlUy/9F6BoANeTOEJjZLmRzG3iA="; + }) + ]; + nativeBuildInputs = [ cmake pkg-config wrapQtAppsHook wrapGAppsHook ]; buildInputs = [ ## Required |