Merge pull request #300290 from NixOS/colmap-autoadd

colmap: use pkgs.autoAddDriverRunpath

authored by Weijia Wang and committed by GitHub dca627c9 dd3a5833

+4 -2
+4 -2
pkgs/applications/science/misc/colmap/default.nix
··· 1 { mkDerivation, lib, fetchFromGitHub, cmake, boost179, ceres-solver, eigen, 2 freeimage, glog, libGLU, glew, qtbase, 3 config, 4 - cudaSupport ? config.cudaSupport, cudaPackages }: 5 6 assert cudaSupport -> cudaPackages != { }; 7 ··· 37 nativeBuildInputs = [ 38 cmake 39 ] ++ lib.optionals cudaSupport [ 40 - cudaPackages.autoAddDriverRunpath 41 ]; 42 43 meta = with lib; {
··· 1 { mkDerivation, lib, fetchFromGitHub, cmake, boost179, ceres-solver, eigen, 2 freeimage, glog, libGLU, glew, qtbase, 3 + autoAddDriverRunpath, 4 config, 5 + cudaSupport ? config.cudaSupport, cudaPackages 6 + }: 7 8 assert cudaSupport -> cudaPackages != { }; 9 ··· 39 nativeBuildInputs = [ 40 cmake 41 ] ++ lib.optionals cudaSupport [ 42 + autoAddDriverRunpath 43 ]; 44 45 meta = with lib; {