diff options
| author | Weijia Wang <9713184+wegank@users.noreply.github.com> | 2024-04-02 00:59:06 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-04-02 00:59:06 +0200 |
| commit | dca627c9d4d859af36a3a86b5a519553377dcfa2 (patch) | |
| tree | 28a8e6a762f286e2e5046c173609c5f6908a2e21 /pkgs/applications/science | |
| parent | dd3a5833b2cfa8f8bc79ba7fe8f7c2a5e552ccf6 (diff) | |
| parent | 47bd04c9d8efa90ba1f854e9e0250dfc8f3392e2 (diff) | |
Merge pull request #300290 from NixOS/colmap-autoadd
colmap: use pkgs.autoAddDriverRunpath
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; { |