From c4adeddb5f8e945517068968d06ea838b7c24bd3 Mon Sep 17 00:00:00 2001 From: Averell Dalton Date: Wed, 7 Aug 2019 21:30:58 +0200 Subject: 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. --- pkgs/development/libraries/opencv/3.x.nix | 3 ++- pkgs/development/libraries/opencv/4.x.nix | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) (limited to 'pkgs/development/libraries/opencv') 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 -- cgit 1.4.1