diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2024-04-02 00:02:54 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-04-02 00:02:54 +0000 |
| commit | 6c56d2db74abdf27a14a9e6eb50c1c9345bafe9e (patch) | |
| tree | dcd38e0c523e6fba8ecaa80cd3c99644a3b4b57e /pkgs/applications/science | |
| parent | 0156d8b9518bdf9085ac8423ba0c90f2b20f4d73 (diff) | |
| parent | abafd81aa28f46a496252c1c74c6465c7e9b7620 (diff) | |
Merge staging-next into staging
Diffstat (limited to 'pkgs/applications/science')
| -rw-r--r-- | pkgs/applications/science/misc/colmap/default.nix | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/pkgs/applications/science/misc/colmap/default.nix b/pkgs/applications/science/misc/colmap/default.nix index 64a7952be4ccc..d071c90562cd4 100644 --- a/pkgs/applications/science/misc/colmap/default.nix +++ b/pkgs/applications/science/misc/colmap/default.nix @@ -1,7 +1,9 @@ { mkDerivation, lib, fetchFromGitHub, cmake, boost179, ceres-solver, eigen, freeimage, glog, libGLU, glew, qtbase, + autoAddDriverRunpath, config, - cudaSupport ? config.cudaSupport, cudaPackages }: + cudaSupport ? config.cudaSupport, cudaPackages +}: assert cudaSupport -> cudaPackages != { }; @@ -37,7 +39,7 @@ mkDerivation rec { nativeBuildInputs = [ cmake ] ++ lib.optionals cudaSupport [ - cudaPackages.autoAddDriverRunpath + autoAddDriverRunpath ]; meta = with lib; { |