Unverified Commit dca627c9 authored by Weijia Wang's avatar Weijia Wang Committed by GitHub
Browse files

Merge pull request #300290 from NixOS/colmap-autoadd 

colmap: use pkgs.autoAddDriverRunpath
parents dd3a5833 47bd04c9

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

+4 −2
Original line number Diff line number Diff line 
{ 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; {