summary refs log tree commit diff
diff options
context:
space:
mode:
authorSandro <sandro.jaeckel@gmail.com>2021-02-18 12:38:10 +0100
committerGitHub <noreply@github.com>2021-02-18 12:38:10 +0100
commita400f564c57e216e0cc9f4c6c659e2d812012367 (patch)
tree8ecf41f3c9b845fe56d289c6000224ca35446d77
parent499bada83bb42b9b1339e0c95b5c0d6d3931e943 (diff)
parent0d5188323aef5bcc478f0c23d34ee2c4c3919efc (diff)
downloadnixpkgs-a400f564c57e216e0cc9f4c6c659e2d812012367.tar
nixpkgs-a400f564c57e216e0cc9f4c6c659e2d812012367.tar.gz
nixpkgs-a400f564c57e216e0cc9f4c6c659e2d812012367.tar.bz2
nixpkgs-a400f564c57e216e0cc9f4c6c659e2d812012367.tar.lz
nixpkgs-a400f564c57e216e0cc9f4c6c659e2d812012367.tar.xz
nixpkgs-a400f564c57e216e0cc9f4c6c659e2d812012367.tar.zst
nixpkgs-a400f564c57e216e0cc9f4c6c659e2d812012367.zip
Merge pull request #113539 from tpwrules/fix-g2o-cholmod
-rw-r--r--pkgs/development/libraries/g2o/default.nix10
1 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/development/libraries/g2o/default.nix b/pkgs/development/libraries/g2o/default.nix
index 6e32db59de4..b967a89568d 100644
--- a/pkgs/development/libraries/g2o/default.nix
+++ b/pkgs/development/libraries/g2o/default.nix
@@ -1,15 +1,15 @@
-{ 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";
-  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
@@ -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";