diff options
| author | Sandro <sandro.jaeckel@gmail.com> | 2021-01-04 14:25:21 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-04 14:25:21 +0100 |
| commit | 6ac4c2d1f60e8e3b37ac55e230edd5a321aa8a49 (patch) | |
| tree | c3e8c1f54b69a57b5f31a82d5c3ad2526715498b /pkgs | |
| parent | f6e519f39e4d6ee694c2a3d5de8f3f263c57980b (diff) | |
| parent | b740afa546fd82b6626f87aa5d63c99f84a47d29 (diff) | |
| download | nixlib-6ac4c2d1f60e8e3b37ac55e230edd5a321aa8a49.tar nixlib-6ac4c2d1f60e8e3b37ac55e230edd5a321aa8a49.tar.gz nixlib-6ac4c2d1f60e8e3b37ac55e230edd5a321aa8a49.tar.bz2 nixlib-6ac4c2d1f60e8e3b37ac55e230edd5a321aa8a49.tar.lz nixlib-6ac4c2d1f60e8e3b37ac55e230edd5a321aa8a49.tar.xz nixlib-6ac4c2d1f60e8e3b37ac55e230edd5a321aa8a49.tar.zst nixlib-6ac4c2d1f60e8e3b37ac55e230edd5a321aa8a49.zip | |
Merge pull request #107962 from flyfloh/colmap-36
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/applications/science/misc/colmap/default.nix | 13 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
2 files changed, 4 insertions, 11 deletions
diff --git a/pkgs/applications/science/misc/colmap/default.nix b/pkgs/applications/science/misc/colmap/default.nix index 83dff3e08f15..60f9810dfb6a 100644 --- a/pkgs/applications/science/misc/colmap/default.nix +++ b/pkgs/applications/science/misc/colmap/default.nix @@ -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, cudaSupport ? false, cudatoolkit ? null }: @@ -7,22 +7,15 @@ assert !cudaSupport || cudatoolkit != null; let boost_static = boost17x.override { enableStatic = true; }; in mkDerivation rec { - version = "3.5"; + version = "3.6"; pname = "colmap"; src = fetchFromGitHub { owner = "colmap"; repo = "colmap"; rev = version; - sha256 = "1vnb62p0y2bnga173wmjs0lnyqdjikv0fkcxjzxm8187khk2lly8"; + sha256 = "1kfivdmhpmdxjjf30rr57y2iy7xmdpg4h8aw3qgacv8ckfpgda3n"; }; - patches = [ - (fetchpatch { - url = "https://github.com/colmap/colmap/commit/6af3d8b0048cecc3b9fc6f4e78c3214dd038180b.patch"; - sha256 = "1zv5girmv4hv78w1xn131v8njwhpbyylc1m15731lnhrs8bri0jq"; - }) - ]; - buildInputs = [ boost_static ceres-solver eigen freeimage glog libGLU glew qtbase diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 898eb4c7bf46..df1e8fdd0400 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9018,7 +9018,7 @@ in colm = callPackage ../development/compilers/colm { }; 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_5 = callPackage ../development/compilers/chicken/5 { }; |