ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2025-01-07 22:11:45 +03:00
Code Issues Projects Releases Wiki Activity

colmap: fix build with gcc9

Browse Source
This commit is contained in:
Franz Pletz 2019-11-03 13:11:17 +01:00
parent 49a3829704
commit dffcb87383
No known key found for this signature in database
GPG Key ID: 846FDED7792617B4
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
pkgs/applications/science/misc/colmap/default.nix
View File

@ -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, freeimage, glog, libGLU, glew, qtbase,
cudaSupport ? false, cudatoolkit ? null }: cudaSupport ? false, cudatoolkit ? null }:
assert !cudaSupport || cudatoolkit != null; assert !cudaSupport || cudatoolkit != null;
let boost_static = boost.override { enableStatic = true; }; let boost_static = boost.override { enableStatic = true; };
in in
mkDerivation rec { mkDerivation rec {
version = "3.5"; version = "3.5";
pname = "colmap"; pname = "colmap";
@ -15,7 +15,14 @@ mkDerivation rec {
rev = version; rev = version;
sha256 = "1vnb62p0y2bnga173wmjs0lnyqdjikv0fkcxjzxm8187khk2lly8"; sha256 = "1vnb62p0y2bnga173wmjs0lnyqdjikv0fkcxjzxm8187khk2lly8";
}; };
patches = [
(fetchpatch {
url = "https://github.com/colmap/colmap/commit/6af3d8b0048cecc3b9fc6f4e78c3214dd038180b.patch";
sha256 = "1zv5girmv4hv78w1xn131v8njwhpbyylc1m15731lnhrs8bri0jq";
})
];
buildInputs = [ buildInputs = [
boost_static ceres-solver eigen boost_static ceres-solver eigen
freeimage glog libGLU glew qtbase freeimage glog libGLU glew qtbase