From d6be909d9b99c4b7389046c6c3c9d05aefcb5971 Mon Sep 17 00:00:00 2001 From: Thomas Watson Date: Thu, 18 Feb 2021 01:06:34 +0000 Subject: [PATCH 1/2] g2o: include dependencies necessary to build CHOLMOD Previously, CHOLMOD was enabled but not built because blas and lapack were missing. --- pkgs/development/libraries/g2o/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/g2o/default.nix b/pkgs/development/libraries/g2o/default.nix index 675d994cf0e..b3c4fa8a894 100644 --- a/pkgs/development/libraries/g2o/default.nix +++ b/pkgs/development/libraries/g2o/default.nix @@ -1,5 +1,5 @@ -{ lib, stdenv, mkDerivation, fetchFromGitHub, cmake, eigen, suitesparse, libGLU -, qtbase, libqglviewer, makeWrapper }: +{ lib, stdenv, mkDerivation, fetchFromGitHub, cmake, eigen, suitesparse, blas +, lapack, libGLU, qtbase, libqglviewer, makeWrapper }: mkDerivation rec { pname = "g2o"; @@ -18,7 +18,7 @@ mkDerivation rec { separateDebugInfo = true; nativeBuildInputs = [ cmake makeWrapper ]; - buildInputs = [ eigen suitesparse libGLU qtbase libqglviewer ]; + buildInputs = [ eigen suitesparse blas lapack libGLU qtbase libqglviewer ]; # Silence noisy warning CXXFLAGS = "-Wno-deprecated-copy"; From 0d5188323aef5bcc478f0c23d34ee2c4c3919efc Mon Sep 17 00:00:00 2001 From: Thomas Watson Date: Thu, 18 Feb 2021 01:59:21 +0000 Subject: [PATCH 2/2] g2o: 20200410 -> 20201223 --- pkgs/development/libraries/g2o/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/g2o/default.nix b/pkgs/development/libraries/g2o/default.nix index b3c4fa8a894..2469e17efec 100644 --- a/pkgs/development/libraries/g2o/default.nix +++ b/pkgs/development/libraries/g2o/default.nix @@ -3,13 +3,13 @@ mkDerivation rec { pname = "g2o"; - version = "20200410"; + version = "20201223"; src = fetchFromGitHub { owner = "RainerKuemmerle"; repo = pname; rev = "${version}_git"; - sha256 = "11rgj2g9mmwajlr69pjkjvxjyn88afa0r4bchjyvmxswjccizlg2"; + sha256 = "sha256-Ik6uBz4Z4rc5+mPNdT8vlNZSBom4Tvt8Y6myBC/s0m8="; }; # Removes a reference to gcc that is only used in a debug message