diff options
| author | Averell Dalton <averell+nixpkgs@rxd4.com> | 2019-08-07 21:30:58 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <freddyrietdijk@fridh.nl> | 2019-08-31 15:55:18 +0200 |
| commit | c4adeddb5f8e945517068968d06ea838b7c24bd3 (patch) | |
| tree | 982ac3563d1ee427a736f82a260fd74fc15a51c5 /pkgs/development/libraries/opencv | |
| parent | 5858a3693e6a4fde37f4e7936e2b11e1b8078230 (diff) | |
| download | nixpkgs-c4adeddb5f8e945517068968d06ea838b7c24bd3.tar nixpkgs-c4adeddb5f8e945517068968d06ea838b7c24bd3.tar.gz nixpkgs-c4adeddb5f8e945517068968d06ea838b7c24bd3.tar.bz2 nixpkgs-c4adeddb5f8e945517068968d06ea838b7c24bd3.tar.lz nixpkgs-c4adeddb5f8e945517068968d06ea838b7c24bd3.tar.xz nixpkgs-c4adeddb5f8e945517068968d06ea838b7c24bd3.tar.zst nixpkgs-c4adeddb5f8e945517068968d06ea838b7c24bd3.zip | |
opencv: dont try cuda on 32 bit
config.cudaSupport can be true and cudatoolkit doesn't work with i686, which can happen inside pkgsi686Linux wrapping.
Diffstat (limited to 'pkgs/development/libraries/opencv')
| -rw-r--r-- | pkgs/development/libraries/opencv/3.x.nix | 3 | ||||
| -rw-r--r-- | pkgs/development/libraries/opencv/4.x.nix | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/pkgs/development/libraries/opencv/3.x.nix b/pkgs/development/libraries/opencv/3.x.nix index d5dc716c4a8..34615f44eb4 100644 --- a/pkgs/development/libraries/opencv/3.x.nix +++ b/pkgs/development/libraries/opencv/3.x.nix @@ -14,7 +14,8 @@ , enableOpenblas ? true, openblas , enableContrib ? true -, enableCuda ? config.cudaSupport or false, cudatoolkit +, enableCuda ? (config.cudaSupport or false) && + stdenv.hostPlatform.isx86_64, cudatoolkit , enableUnfree ? false , enableIpp ? false diff --git a/pkgs/development/libraries/opencv/4.x.nix b/pkgs/development/libraries/opencv/4.x.nix index 3fdc392e92b..44bd9c32aef 100644 --- a/pkgs/development/libraries/opencv/4.x.nix +++ b/pkgs/development/libraries/opencv/4.x.nix @@ -14,7 +14,8 @@ , enableOpenblas ? true, openblas , enableContrib ? true -, enableCuda ? config.cudaSupport or false, cudatoolkit +, enableCuda ? (config.cudaSupport or false) && + stdenv.hostPlatform.isx86_64, cudatoolkit , enableUnfree ? false , enableIpp ? false |