diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2019-12-30 16:38:38 +0100 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2019-12-30 16:38:38 +0100 |
| commit | 6d059becd396ca8722904081cff7225bc64d5a44 (patch) | |
| tree | e723580f3aa9aeec12d407dbea2c4a0fa1808c95 /pkgs/applications/science/misc | |
| parent | bfa5af85b733defd158965fe91d60fd3f7a8a666 (diff) | |
| parent | 59ab29fe88b06b31de5bea7ac11492a9dbc0c680 (diff) | |
| download | nixlib-6d059becd396ca8722904081cff7225bc64d5a44.tar nixlib-6d059becd396ca8722904081cff7225bc64d5a44.tar.gz nixlib-6d059becd396ca8722904081cff7225bc64d5a44.tar.bz2 nixlib-6d059becd396ca8722904081cff7225bc64d5a44.tar.lz nixlib-6d059becd396ca8722904081cff7225bc64d5a44.tar.xz nixlib-6d059becd396ca8722904081cff7225bc64d5a44.tar.zst nixlib-6d059becd396ca8722904081cff7225bc64d5a44.zip | |
Merge gcc-9 into staging (#68029)
Diffstat (limited to 'pkgs/applications/science/misc')
| -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 672569ed1002..da118f6bca57 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 |