diff options
| author | Someone Serge <sergei.kozlukov@aalto.fi> | 2023-11-02 18:18:35 +0000 |
|---|---|---|
| committer | Someone Serge <sergei.kozlukov@aalto.fi> | 2023-11-02 19:13:31 +0000 |
| commit | 866daf5f7c9d06464b2007070c1c3e4183603f6f (patch) | |
| tree | 06d84f8911fe9d5802261afebfb9941565cf4d3c | |
| parent | c7dbb3ccc9795a85f9bda642f783754deae7c111 (diff) | |
| download | nixpkgs-866daf5f7c9d06464b2007070c1c3e4183603f6f.tar nixpkgs-866daf5f7c9d06464b2007070c1c3e4183603f6f.tar.gz nixpkgs-866daf5f7c9d06464b2007070c1c3e4183603f6f.tar.bz2 nixpkgs-866daf5f7c9d06464b2007070c1c3e4183603f6f.tar.lz nixpkgs-866daf5f7c9d06464b2007070c1c3e4183603f6f.tar.xz nixpkgs-866daf5f7c9d06464b2007070c1c3e4183603f6f.tar.zst nixpkgs-866daf5f7c9d06464b2007070c1c3e4183603f6f.zip | |
opencv{3,4}: do not ignore config.cudaSupport
i686 isn't in the meta.platforms for cudaPackages anyway
| -rw-r--r-- | pkgs/development/libraries/opencv/3.x.nix | 3 | ||||
| -rw-r--r-- | pkgs/development/libraries/opencv/4.x.nix | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/pkgs/development/libraries/opencv/3.x.nix b/pkgs/development/libraries/opencv/3.x.nix index 33bb5bfae26..e65f7ce01da 100644 --- a/pkgs/development/libraries/opencv/3.x.nix +++ b/pkgs/development/libraries/opencv/3.x.nix @@ -15,8 +15,7 @@ , enableOpenblas ? true, openblas, blas, lapack , enableContrib ? true -, enableCuda ? config.cudaSupport && - stdenv.hostPlatform.isx86_64 +, enableCuda ? config.cudaSupport , cudaPackages ? { } , enableUnfree ? false , enableIpp ? false diff --git a/pkgs/development/libraries/opencv/4.x.nix b/pkgs/development/libraries/opencv/4.x.nix index 21fcfc432d7..05bb780c252 100644 --- a/pkgs/development/libraries/opencv/4.x.nix +++ b/pkgs/development/libraries/opencv/4.x.nix @@ -37,7 +37,7 @@ , blas , enableContrib ? true -, enableCuda ? config.cudaSupport && stdenv.hostPlatform.isx86_64 +, enableCuda ? config.cudaSupport , enableCublas ? enableCuda , enableCudnn ? false # NOTE: CUDNN has a large impact on closure size so we disable it by default , enableCufft ? enableCuda |