commit 75eef96f08c7f5ef5f1cf1c9900359e06c556000

pyrox.dev / nixpkgs

lol

fork atom

colmapWithCuda: fix build

authored by

Florian Pester and committed by

Florian 5 years ago 75eef96f 3d2ffa3d

+2 -2

2 changed files

expand all

unified split

pkgs

applications

science

misc

colmap

default.nix

top-level

all-packages.nix

+1 -1

pkgs/applications/science/misc/colmap/default.nix

··· 1 - { mkDerivation, lib, fetchpatch, fetchFromGitHub, cmake, boost17x, ceres-solver, eigen, 1 + { mkDerivation, lib, fetchFromGitHub, cmake, boost17x, ceres-solver, eigen, 2 2 freeimage, glog, libGLU, glew, qtbase, 3 3 cudaSupport ? false, cudatoolkit ? null }: 4 4

+1 -1

pkgs/top-level/all-packages.nix

··· 8949 8949 colm = callPackage ../development/compilers/colm { }; 8950 8950 8951 8951 colmap = libsForQt514.callPackage ../applications/science/misc/colmap { }; 8952 - colmapWithCuda = colmap.override { cudaSupport = true; }; 8952 + colmapWithCuda = colmap.override { cudaSupport = true; cudatoolkit = cudatoolkit_11; }; 8953 8953 8954 8954 chickenPackages_4 = callPackage ../development/compilers/chicken/4 { }; 8955 8955 chickenPackages_5 = callPackage ../development/compilers/chicken/5 { };