diff options
| author | Someone Serge <sergei.kozlukov@aalto.fi> | 2023-11-03 13:34:48 +0000 |
|---|---|---|
| committer | Someone Serge <sergei.kozlukov@aalto.fi> | 2023-11-03 13:34:48 +0000 |
| commit | d4229c0e327a09eba11b7472c5c329aa44e961bf (patch) | |
| tree | afb285bc29652ecd6fe15b418a91dbec24028b14 /pkgs/development/libraries/opencv | |
| parent | 866daf5f7c9d06464b2007070c1c3e4183603f6f (diff) | |
| download | nixpkgs-d4229c0e327a09eba11b7472c5c329aa44e961bf.tar nixpkgs-d4229c0e327a09eba11b7472c5c329aa44e961bf.tar.gz nixpkgs-d4229c0e327a09eba11b7472c5c329aa44e961bf.tar.bz2 nixpkgs-d4229c0e327a09eba11b7472c5c329aa44e961bf.tar.lz nixpkgs-d4229c0e327a09eba11b7472c5c329aa44e961bf.tar.xz nixpkgs-d4229c0e327a09eba11b7472c5c329aa44e961bf.tar.zst nixpkgs-d4229c0e327a09eba11b7472c5c329aa44e961bf.zip | |
opecv4: drop symlinkJoin
Diffstat (limited to 'pkgs/development/libraries/opencv')
| -rw-r--r-- | pkgs/development/libraries/opencv/4.x.nix | 29 |
1 files changed, 11 insertions, 18 deletions
diff --git a/pkgs/development/libraries/opencv/4.x.nix b/pkgs/development/libraries/opencv/4.x.nix index 05bb780c252..01e96e8f5b4 100644 --- a/pkgs/development/libraries/opencv/4.x.nix +++ b/pkgs/development/libraries/opencv/4.x.nix @@ -42,7 +42,6 @@ , enableCudnn ? false # NOTE: CUDNN has a large impact on closure size so we disable it by default , enableCufft ? enableCuda , cudaPackages ? {} -, symlinkJoin , nvidia-optical-flow-sdk , enableLto ? true @@ -240,22 +239,6 @@ let inherit (cudaPackages) cudaFlags cudaVersion; inherit (cudaFlags) cudaCapabilities; - cuda-common-redist = with cudaPackages; [ - cuda_cudart - cuda_cccl # <thrust/*> - libnpp # npp.h - ] ++ lib.optionals enableCublas [ - libcublas # cublas_v2.h - ] ++ lib.optionals enableCudnn [ - cudnn # cudnn.h - ] ++ lib.optionals enableCufft [ - libcufft # cufft.h - ]; - - cuda-redist = symlinkJoin { - name = "cuda-redist-${cudaVersion}"; - paths = cuda-common-redist; - }; in effectiveStdenv.mkDerivation { @@ -345,7 +328,17 @@ effectiveStdenv.mkDerivation { bzip2 AVFoundation Cocoa VideoDecodeAcceleration CoreMedia MediaToolbox Accelerate ] ++ lib.optionals enableDocs [ doxygen graphviz-nox ] - ++ lib.optionals enableCuda [ cuda-redist ]; + ++ lib.optionals enableCuda (with cudaPackages; [ + cuda_cudart + cuda_cccl # <thrust/*> + libnpp # npp.h + ] ++ lib.optionals enableCublas [ + libcublas # cublas_v2.h + ] ++ lib.optionals enableCudnn [ + cudnn # cudnn.h + ] ++ lib.optionals enableCufft [ + libcufft # cufft.h + ]); propagatedBuildInputs = lib.optional enablePython pythonPackages.numpy ++ lib.optionals enableCuda [ nvidia-optical-flow-sdk ]; |