Unverified Commit b571c88a authored by ckie's avatar ckie Committed by GitHub
Browse files

Merge pull request #250016 from lopsided98/g2o-update

parents 7a23ba5e 78fd6b41
Loading
Loading
Loading
Loading
+14 −0
Original line number Diff line number Diff line
{ 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
+6 −4
Original line number Diff line number Diff line
{ 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;