colmap: fix build with gcc9
This commit is contained in:
parent
49a3829704
commit
dffcb87383
|
@ -1,11 +1,11 @@
|
|||
{ mkDerivation, lib, fetchFromGitHub, cmake, boost, ceres-solver, eigen,
|
||||
{ mkDerivation, lib, fetchpatch, fetchFromGitHub, cmake, boost, ceres-solver, eigen,
|
||||
freeimage, glog, libGLU, glew, qtbase,
|
||||
cudaSupport ? false, cudatoolkit ? null }:
|
||||
|
||||
assert !cudaSupport || cudatoolkit != null;
|
||||
|
||||
let boost_static = boost.override { enableStatic = true; };
|
||||
in
|
||||
in
|
||||
mkDerivation rec {
|
||||
version = "3.5";
|
||||
pname = "colmap";
|
||||
|
@ -15,7 +15,14 @@ mkDerivation rec {
|
|||
rev = version;
|
||||
sha256 = "1vnb62p0y2bnga173wmjs0lnyqdjikv0fkcxjzxm8187khk2lly8";
|
||||
};
|
||||
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
url = "https://github.com/colmap/colmap/commit/6af3d8b0048cecc3b9fc6f4e78c3214dd038180b.patch";
|
||||
sha256 = "1zv5girmv4hv78w1xn131v8njwhpbyylc1m15731lnhrs8bri0jq";
|
||||
})
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
boost_static ceres-solver eigen
|
||||
freeimage glog libGLU glew qtbase
|
||||
|
|
Loading…
Reference in a new issue