colin
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #300290 from NixOS/colmap-autoadd 

colmap: use pkgs.autoAddDriverRunpath
This commit is contained in:
Weijia Wang 2024-04-02 00:59:06 +02:00 committed by GitHub
parent dd3a5833b2 47bd04c9d8
commit dca627c9d4
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/applications/science/misc/colmap/default.nix
View File

@ -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; {