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

Merge pull request #107962 from flyfloh/colmap-36

Browse Source
This commit is contained in:
Sandro 2021-01-04 14:25:21 +01:00 committed by GitHub
commit 6ac4c2d1f6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 11 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,4 +1,4 @@
{ mkDerivation, lib, fetchpatch, fetchFromGitHub, cmake, boost17x, ceres-solver, eigen, { mkDerivation, lib, fetchFromGitHub, cmake, boost17x, ceres-solver, eigen,
freeimage, glog, libGLU, glew, qtbase, freeimage, glog, libGLU, glew, qtbase,
cudaSupport ? false, cudatoolkit ? null }: cudaSupport ? false, cudatoolkit ? null }:
@ -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

2
pkgs/top-level/all-packages.nix
View File

@ -9018,7 +9018,7 @@ in
colm = callPackage ../development/compilers/colm { }; colm = callPackage ../development/compilers/colm { };
colmap = libsForQt514.callPackage ../applications/science/misc/colmap { }; colmap = libsForQt514.callPackage ../applications/science/misc/colmap { };
colmapWithCuda = colmap.override { cudaSupport = true; }; colmapWithCuda = colmap.override { cudaSupport = true; cudatoolkit = cudatoolkit_11; };
chickenPackages_4 = callPackage ../development/compilers/chicken/4 { }; chickenPackages_4 = callPackage ../development/compilers/chicken/4 { };
chickenPackages_5 = callPackage ../development/compilers/chicken/5 { }; chickenPackages_5 = callPackage ../development/compilers/chicken/5 { };