From 75eef96f08c7f5ef5f1cf1c9900359e06c556000 Mon Sep 17 00:00:00 2001 From: Florian Pester Date: Mon, 28 Dec 2020 13:01:41 +0100 Subject: [PATCH 1/2] colmapWithCuda: fix build --- pkgs/applications/science/misc/colmap/default.nix | 2 +- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/misc/colmap/default.nix b/pkgs/applications/science/misc/colmap/default.nix index 83dff3e08f1..02592f808d8 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 }: diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d9fdc2ef441..f1d077f2a61 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8949,7 +8949,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 { }; From b740afa546fd82b6626f87aa5d63c99f84a47d29 Mon Sep 17 00:00:00 2001 From: Florian Pester Date: Wed, 30 Dec 2020 12:35:55 +0100 Subject: [PATCH 2/2] colmap: 3.5 -> 3.6 --- pkgs/applications/science/misc/colmap/default.nix | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/pkgs/applications/science/misc/colmap/default.nix b/pkgs/applications/science/misc/colmap/default.nix index 02592f808d8..60f9810dfb6 100644 --- a/pkgs/applications/science/misc/colmap/default.nix +++ b/pkgs/applications/science/misc/colmap/default.nix @@ -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