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

colmap: 3.5 -> 3.6

Browse Source
This commit is contained in:
Florian Pester 2020-12-30 12:35:55 +01:00 committed by Florian
parent 75eef96f08
commit b740afa546
1 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -7,22 +7,15 @@ assert !cudaSupport || cudatoolkit != null;
let boost_static = boost17x.override { enableStatic = true; }; let boost_static = boost17x.override { enableStatic = true; };
in in
mkDerivation rec { mkDerivation rec {
version = "3.5"; version = "3.6";
pname = "colmap"; pname = "colmap";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "colmap"; owner = "colmap";
repo = "colmap"; repo = "colmap";
rev = version; rev = version;
sha256 = "1vnb62p0y2bnga173wmjs0lnyqdjikv0fkcxjzxm8187khk2lly8"; sha256 = "1kfivdmhpmdxjjf30rr57y2iy7xmdpg4h8aw3qgacv8ckfpgda3n";
}; };
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