diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2019-08-31 18:04:31 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2019-08-31 18:04:31 +0200 |
| commit | 96e5474329a3c2b2309872fb01b007daaf6d7bdc (patch) | |
| tree | a5493889e970cb255749576723666ce77d513cf1 /pkgs/development/libraries/opencv | |
| parent | 4b515cf6ef45299028b9c641c0cec3df006f8709 (diff) | |
| parent | cbbe9f0f211a7c96e7daa7a6e9242b46f841fff2 (diff) | |
| download | nixpkgs-96e5474329a3c2b2309872fb01b007daaf6d7bdc.tar nixpkgs-96e5474329a3c2b2309872fb01b007daaf6d7bdc.tar.gz nixpkgs-96e5474329a3c2b2309872fb01b007daaf6d7bdc.tar.bz2 nixpkgs-96e5474329a3c2b2309872fb01b007daaf6d7bdc.tar.lz nixpkgs-96e5474329a3c2b2309872fb01b007daaf6d7bdc.tar.xz nixpkgs-96e5474329a3c2b2309872fb01b007daaf6d7bdc.tar.zst nixpkgs-96e5474329a3c2b2309872fb01b007daaf6d7bdc.zip | |
Merge master into staging-next
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 e35f5375fd9..d3efb022a0e 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 5732ce9e1ca..205a87d78e8 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 |