public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

opencv3, opencv4: move defaults to package file

Browse Source
This commit is contained in:
Jan Malakhovski 2019-02-03 15:33:15 +00:00
parent 8abaf8dfe5
commit 8e929441a9
3 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/libraries/opencv/3.x.nix
View File

@ -8,13 +8,13 @@
, enablePNG ? true, libpng , enablePNG ? true, libpng
, enableTIFF ? true, libtiff , enableTIFF ? true, libtiff
, enableWebP ? true, libwebp , enableWebP ? true, libwebp
, enableEXR ? (!stdenv.isDarwin), openexr, ilmbase , enableEXR ? !stdenv.isDarwin, openexr, ilmbase
, enableJPEG2K ? true, jasper , enableJPEG2K ? true, jasper
, enableEigen ? true, eigen , enableEigen ? true, eigen
, enableOpenblas ? true, openblas , enableOpenblas ? true, openblas
, enableContrib ? true , enableContrib ? true
, enableCuda ? (config.cudaSupport or false), cudatoolkit , enableCuda ? config.cudaSupport or false, cudatoolkit
, enableUnfree ? false , enableUnfree ? false
, enableIpp ? false , enableIpp ? false

4
pkgs/development/libraries/opencv/4.x.nix
View File

@ -8,13 +8,13 @@
, enablePNG ? true, libpng , enablePNG ? true, libpng
, enableTIFF ? true, libtiff , enableTIFF ? true, libtiff
, enableWebP ? true, libwebp , enableWebP ? true, libwebp
, enableEXR ? (!stdenv.isDarwin), openexr, ilmbase , enableEXR ? !stdenv.isDarwin, openexr, ilmbase
, enableJPEG2K ? true, jasper , enableJPEG2K ? true, jasper
, enableEigen ? true, eigen , enableEigen ? true, eigen
, enableOpenblas ? true, openblas , enableOpenblas ? true, openblas
, enableContrib ? true , enableContrib ? true
, enableCuda ? (config.cudaSupport or false), cudatoolkit , enableCuda ? config.cudaSupport or false, cudatoolkit
, enableUnfree ? false , enableUnfree ? false
, enableIpp ? false , enableIpp ? false

2
pkgs/top-level/all-packages.nix
View File

@ -11868,7 +11868,6 @@ in
}; };
opencv3 = callPackage ../development/libraries/opencv/3.x.nix { opencv3 = callPackage ../development/libraries/opencv/3.x.nix {
enableCuda = config.cudaSupport or false;
inherit (darwin) cf-private; inherit (darwin) cf-private;
inherit (darwin.apple_sdk.frameworks) AVFoundation Cocoa QTKit VideoDecodeAcceleration; inherit (darwin.apple_sdk.frameworks) AVFoundation Cocoa QTKit VideoDecodeAcceleration;
}; };
@ -11878,7 +11877,6 @@ in
}; };
opencv4 = callPackage ../development/libraries/opencv/4.x.nix { opencv4 = callPackage ../development/libraries/opencv/4.x.nix {
enableCuda = config.cudaSupport or false;
inherit (darwin) cf-private; inherit (darwin) cf-private;
inherit (darwin.apple_sdk.frameworks) AVFoundation Cocoa QTKit VideoDecodeAcceleration; inherit (darwin.apple_sdk.frameworks) AVFoundation Cocoa QTKit VideoDecodeAcceleration;
}; };