diff options
| author | Franz Pletz <fpletz@fnordicwalking.de> | 2019-11-03 13:11:17 +0100 |
|---|---|---|
| committer | Franz Pletz <fpletz@fnordicwalking.de> | 2019-11-03 14:43:33 +0100 |
| commit | dffcb8738384c488bec1878c023db21ce1e6b471 (patch) | |
| tree | fda84017d431b4e5d205580dc129f06699c7c57b /pkgs/applications/science | |
| parent | 49a3829704e83b62e356da4ef268e436f9159e62 (diff) | |
| download | nixpkgs-dffcb8738384c488bec1878c023db21ce1e6b471.tar nixpkgs-dffcb8738384c488bec1878c023db21ce1e6b471.tar.gz nixpkgs-dffcb8738384c488bec1878c023db21ce1e6b471.tar.bz2 nixpkgs-dffcb8738384c488bec1878c023db21ce1e6b471.tar.lz nixpkgs-dffcb8738384c488bec1878c023db21ce1e6b471.tar.xz nixpkgs-dffcb8738384c488bec1878c023db21ce1e6b471.tar.zst nixpkgs-dffcb8738384c488bec1878c023db21ce1e6b471.zip | |
colmap: fix build with gcc9
Diffstat (limited to 'pkgs/applications/science')
| -rw-r--r-- | pkgs/applications/science/misc/colmap/default.nix | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/pkgs/applications/science/misc/colmap/default.nix b/pkgs/applications/science/misc/colmap/default.nix index 672569ed100..da118f6bca5 100644 --- a/pkgs/applications/science/misc/colmap/default.nix +++ b/pkgs/applications/science/misc/colmap/default.nix @@ -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 |