diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2019-08-31 18:07:33 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2019-08-31 18:07:33 +0200 |
| commit | 98ef78326d4349a14e328b322495e34242d796cc (patch) | |
| tree | 1582a9a7d560d91b7125a4b5a4c49dab62a0479d /pkgs/development/libraries/opencv | |
| parent | 92b96ce63fa8752d0487edbe026a37ff765b33b3 (diff) | |
| parent | 96e5474329a3c2b2309872fb01b007daaf6d7bdc (diff) | |
| download | nixpkgs-98ef78326d4349a14e328b322495e34242d796cc.tar nixpkgs-98ef78326d4349a14e328b322495e34242d796cc.tar.gz nixpkgs-98ef78326d4349a14e328b322495e34242d796cc.tar.bz2 nixpkgs-98ef78326d4349a14e328b322495e34242d796cc.tar.lz nixpkgs-98ef78326d4349a14e328b322495e34242d796cc.tar.xz nixpkgs-98ef78326d4349a14e328b322495e34242d796cc.tar.zst nixpkgs-98ef78326d4349a14e328b322495e34242d796cc.zip | |
Merge staging-next into staging
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 d7f897ebcf8..d8946dae095 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 153737e2761..aa4c7afa4db 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 |