about summary refs log tree commit diff
path: root/pkgs/applications/video
diff options
context:
space:
mode:
authorckie <git-525ff67@ckie.dev>2024-03-10 23:51:05 +0200
committerGitHub <noreply@github.com>2024-03-10 23:51:05 +0200
commit3eee36cbbdda250ca2b5eebb187a96602143a725 (patch)
tree4e11c68110549564e1312f647ef614f90d64ecd6 /pkgs/applications/video
parent132580d70a73003f4302840e71b3e0e93935fafc (diff)
parent6b3ef3b48669dfe76fe5b10bea612da03bf6ea2c (diff)
Merge pull request #294674 from hacker1024/update/rtabmap
Diffstat (limited to 'pkgs/applications/video')
-rw-r--r--pkgs/applications/video/rtabmap/default.nix17
1 files changed, 2 insertions, 15 deletions
diff --git a/pkgs/applications/video/rtabmap/default.nix b/pkgs/applications/video/rtabmap/default.nix
index c25d89ea2375e..1147d1ef1d949 100644
--- a/pkgs/applications/video/rtabmap/default.nix
+++ b/pkgs/applications/video/rtabmap/default.nix
@@ -27,28 +27,15 @@
 
 stdenv.mkDerivation rec {
   pname = "rtabmap";
-  version = "0.21.0";
+  version = "0.21.4";
 
   src = fetchFromGitHub {
     owner = "introlab";
     repo = "rtabmap";
     rev = "refs/tags/${version}";
-    hash = "sha256-1xb8O3VrErldid2OgAUMG28mSUO7QBUsPuSz8p03tSI";
+    hash = "sha256-HrIATYRuhFfTlO4oTRZo7CM30LFVyatZJON31Fe4HTQ=";
   };
 
-  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