From 75eef96f08c7f5ef5f1cf1c9900359e06c556000 Mon Sep 17 00:00:00 2001 From: Florian Pester Date: Mon, 28 Dec 2020 13:01:41 +0100 Subject: [PATCH] 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 83dff3e08f15..02592f808d8e 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 d9fdc2ef441b..f1d077f2a610 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 { };