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

Merge pull request #113539 from tpwrules/fix-g2o-cholmod

Browse Source
This commit is contained in:
Sandro 2021-02-18 12:38:10 +01:00 committed by GitHub
commit a400f564c5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,15 +1,15 @@
{ lib, stdenv, mkDerivation, fetchFromGitHub, cmake, eigen, suitesparse, libGLU { lib, stdenv, mkDerivation, fetchFromGitHub, cmake, eigen, suitesparse, blas
, qtbase, libqglviewer, makeWrapper }: , lapack, libGLU, qtbase, libqglviewer, makeWrapper }:
mkDerivation rec { mkDerivation rec {
pname = "g2o"; pname = "g2o";
version = "20200410"; version = "20201223";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "RainerKuemmerle"; owner = "RainerKuemmerle";
repo = pname; repo = pname;
rev = "${version}_git"; rev = "${version}_git";
sha256 = "11rgj2g9mmwajlr69pjkjvxjyn88afa0r4bchjyvmxswjccizlg2"; sha256 = "sha256-Ik6uBz4Z4rc5+mPNdT8vlNZSBom4Tvt8Y6myBC/s0m8=";
}; };
# Removes a reference to gcc that is only used in a debug message # Removes a reference to gcc that is only used in a debug message
@ -18,7 +18,7 @@ mkDerivation rec {
separateDebugInfo = true; separateDebugInfo = true;
nativeBuildInputs = [ cmake makeWrapper ]; nativeBuildInputs = [ cmake makeWrapper ];
buildInputs = [ eigen suitesparse libGLU qtbase libqglviewer ]; buildInputs = [ eigen suitesparse blas lapack libGLU qtbase libqglviewer ];
# Silence noisy warning # Silence noisy warning
CXXFLAGS = "-Wno-deprecated-copy"; CXXFLAGS = "-Wno-deprecated-copy";