diff options
| author | Connor Baker <connor.baker@tweag.io> | 2023-03-17 10:17:50 -0400 |
|---|---|---|
| committer | Connor Baker <connor.baker@tweag.io> | 2023-03-17 10:17:50 -0400 |
| commit | cd16931110f1e5647308c338454eab030a66c791 (patch) | |
| tree | 74ba68b1ab1351d035a95bf1df70de773b762d0d /pkgs/development/libraries/opencv | |
| parent | a418cae499fe92ab526bbdce807a6a3ebe5b8323 (diff) | |
| download | nixpkgs-cd16931110f1e5647308c338454eab030a66c791.tar nixpkgs-cd16931110f1e5647308c338454eab030a66c791.tar.gz nixpkgs-cd16931110f1e5647308c338454eab030a66c791.tar.bz2 nixpkgs-cd16931110f1e5647308c338454eab030a66c791.tar.lz nixpkgs-cd16931110f1e5647308c338454eab030a66c791.tar.xz nixpkgs-cd16931110f1e5647308c338454eab030a66c791.tar.zst nixpkgs-cd16931110f1e5647308c338454eab030a66c791.zip | |
opencv: use cudaPackages.backendStdenv.cc instead of cudaPackages.cudatoolkit.cc
Diffstat (limited to 'pkgs/development/libraries/opencv')
| -rw-r--r-- | pkgs/development/libraries/opencv/4.x.nix | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/development/libraries/opencv/4.x.nix b/pkgs/development/libraries/opencv/4.x.nix index 9337e29b08a..496412dda32 100644 --- a/pkgs/development/libraries/opencv/4.x.nix +++ b/pkgs/development/libraries/opencv/4.x.nix @@ -230,7 +230,7 @@ let #https://github.com/xianyi/OpenBLAS/wiki/Faq/4bded95e8dc8aadc70ce65267d1093ca7bdefc4c#multi-threaded openblas_ = blas.provider.override { singleThreaded = true; }; - inherit (cudaPackages) cudaFlags cudatoolkit cudaVersion; + inherit (cudaPackages) backendStdenv cudaFlags cudaVersion; inherit (cudaFlags) cudaCapabilities; cuda-common-redist = with cudaPackages; [ @@ -383,15 +383,15 @@ stdenv.mkDerivation { enableLto && ( # Only clang supports thin LTO, so we must either be using clang through the stdenv, stdenv.cc.isClang || - # or through cudatoolkit. - (enableCuda && cudatoolkit.cc.isClang) + # or through the backend stdenv. + (enableCuda && backendStdenv.cc.isClang) ) )) ] ++ lib.optionals enableCuda [ "-DCUDA_FAST_MATH=ON" # We need to set the C and C++ host compilers for CUDA to the same compiler. - "-DCMAKE_C_COMPILER=${cudatoolkit.cc}/bin/cc" - "-DCMAKE_CXX_COMPILER=${cudatoolkit.cc}/bin/c++" + "-DCMAKE_C_COMPILER=${backendStdenv.cc}/bin/cc" + "-DCMAKE_CXX_COMPILER=${backendStdenv.cc}/bin/c++" "-DCUDA_NVCC_FLAGS=--expt-relaxed-constexpr" # OpenCV respects at least three variables: |