diff options
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/opencv')
-rw-r--r-- | nixpkgs/pkgs/development/libraries/opencv/3.x.nix | 5 | ||||
-rw-r--r-- | nixpkgs/pkgs/development/libraries/opencv/4.x.nix | 5 | ||||
-rw-r--r-- | nixpkgs/pkgs/development/libraries/opencv/default.nix | 2 |
3 files changed, 7 insertions, 5 deletions
diff --git a/nixpkgs/pkgs/development/libraries/opencv/3.x.nix b/nixpkgs/pkgs/development/libraries/opencv/3.x.nix index d5dc716c4a8f..d3efb022a0e0 100644 --- a/nixpkgs/pkgs/development/libraries/opencv/3.x.nix +++ b/nixpkgs/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 @@ -140,7 +141,7 @@ let in stdenv.mkDerivation rec { - name = "opencv-${version}"; + pname = "opencv"; inherit version src; postUnpack = lib.optionalString buildContrib '' diff --git a/nixpkgs/pkgs/development/libraries/opencv/4.x.nix b/nixpkgs/pkgs/development/libraries/opencv/4.x.nix index 3fdc392e92b8..205a87d78e8f 100644 --- a/nixpkgs/pkgs/development/libraries/opencv/4.x.nix +++ b/nixpkgs/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 @@ -153,7 +154,7 @@ let in stdenv.mkDerivation rec { - name = "opencv-${version}"; + pname = "opencv"; inherit version src; postUnpack = lib.optionalString buildContrib '' diff --git a/nixpkgs/pkgs/development/libraries/opencv/default.nix b/nixpkgs/pkgs/development/libraries/opencv/default.nix index 784071c6e4d4..b91a1489eb69 100644 --- a/nixpkgs/pkgs/development/libraries/opencv/default.nix +++ b/nixpkgs/pkgs/development/libraries/opencv/default.nix @@ -19,7 +19,7 @@ let in stdenv.mkDerivation rec { - name = "opencv-${version}"; + pname = "opencv"; version = "2.4.13"; src = fetchFromGitHub { |