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

Merge pull request #85338 from lopsided98/g2o-update

Browse Source 
g2o: unstable-2019-04-07 -> 20200410
This commit is contained in:
worldofpeace 2020-04-16 02:33:43 -04:00 committed by GitHub
commit 10d1088f7f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,15 +1,15 @@
{ lib, stdenv, fetchFromGitHub, cmake, eigen, suitesparse, libGLU, qt5
, libsForQt5, makeWrapper }:
{ lib, stdenv, mkDerivation, fetchFromGitHub, cmake, eigen, suitesparse, libGLU
, qtbase, libqglviewer, makeWrapper }:
stdenv.mkDerivation rec {
mkDerivation rec {
pname = "g2o";
version = "unstable-2019-04-07";
version = "20200410";
src = fetchFromGitHub {
owner = "RainerKuemmerle";
repo = pname;
rev = "9b41a4ea5ade8e1250b9c1b279f3a9c098811b5a";
sha256 = "1rgrz6zxiinrik3lgwgvsmlww1m2fnpjmvcx1mf62xi1s2ma5w2i";
rev = "${version}_git";
sha256 = "11rgj2g9mmwajlr69pjkjvxjyn88afa0r4bchjyvmxswjccizlg2";
};
# Removes a reference to gcc that is only used in a debug message
@ -18,11 +18,14 @@ stdenv.mkDerivation rec {
separateDebugInfo = true;
nativeBuildInputs = [ cmake makeWrapper ];
buildInputs = [ eigen suitesparse libGLU qt5.qtbase libsForQt5.libqglviewer ];
buildInputs = [ eigen suitesparse libGLU qtbase libqglviewer ];
# Silence noisy warning
CXXFLAGS = "-Wno-deprecated-copy";
cmakeFlags = [
# Detection script is broken
"-DQGLVIEWER_INCLUDE_DIR=${libsForQt5.libqglviewer}/include/QGLViewer"
"-DQGLVIEWER_INCLUDE_DIR=${libqglviewer}/include/QGLViewer"
"-DG2O_BUILD_EXAMPLES=OFF"
] ++ lib.optionals stdenv.isx86_64 ([ "-DDO_SSE_AUTODETECT=OFF" ] ++ {
default = [ "-DDISABLE_SSE3=ON" "-DDISABLE_SSE4_1=ON" "-DDISABLE_SSE4_2=ON" "-DDISABLE_SSE4_A=ON" ];
@ -35,16 +38,11 @@ stdenv.mkDerivation rec {
skylake-avx512 = [ "-DDISABLE_SSE4_A=ON" ];
}.${stdenv.hostPlatform.platform.gcc.arch or "default"});
postInstall = ''
wrapProgram $out/bin/g2o_viewer \
--prefix QT_PLUGIN_PATH : "${qt5.qtbase}/${qt5.qtbase.qtPluginPrefix}"
'';
meta = {
meta = with lib; {
description = "A General Framework for Graph Optimization";
homepage = "https://github.com/RainerKuemmerle/g2o";
license = with lib.licenses; [ bsd3 lgpl3 gpl3 ];
maintainers = with lib.maintainers; [ lopsided98 ];
platforms = lib.platforms.all;
license = with licenses; [ bsd3 lgpl3 gpl3 ];
maintainers = with maintainers; [ lopsided98 ];
platforms = platforms.all;
};
}

2
pkgs/top-level/all-packages.nix
View File

@ -1809,7 +1809,7 @@ in
fzy = callPackage ../tools/misc/fzy { };
g2o = callPackage ../development/libraries/g2o { };
g2o = libsForQt5.callPackage ../development/libraries/g2o { };
gbsplay = callPackage ../applications/audio/gbsplay { };