colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #250016 from lopsided98/g2o-update

Browse Source
This commit is contained in:
ckie 2023-12-11 02:59:37 +02:00 committed by GitHub
commit b571c88ad3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 20 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pkgs/applications/video/rtabmap/default.nix
View File

@ -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

10
pkgs/development/libraries/g2o/default.nix
View File

@ -1,24 +1,26 @@
{ lib, stdenv, mkDerivation, fetchFromGitHub, cmake, eigen, suitesparse, blas
, lapack, libGLU, qtbase, libqglviewer, makeWrapper }:
, lapack, libGLU, qtbase, libqglviewer, spdlog }:
mkDerivation rec {
pname = "g2o";
version = "20230223";
version = "20230806";
src = fetchFromGitHub {
owner = "RainerKuemmerle";
repo = pname;
rev = "${version}_git";
sha256 = "sha256-J2Z3oRkyiinIfywBQvnq1Q8Z5WuzQXOVTZTwN8oivf0=";
hash = "sha256-9u1FFRWe7qvDhzSKdGTduuGBXmmgzcSriGFb/oCJjNA=";
};
# Removes a reference to gcc that is only used in a debug message
patches = [ ./remove-compiler-reference.patch ];
outputs = [ "out" "dev" ];
separateDebugInfo = true;
nativeBuildInputs = [ cmake makeWrapper ];
nativeBuildInputs = [ cmake ];
buildInputs = [ eigen suitesparse blas lapack libGLU qtbase libqglviewer ];
propagatedBuildInputs = [ spdlog ];
dontWrapQtApps = true;