diff options
| author | Jan Malakhovski <oxij@oxij.org> | 2019-02-03 15:33:15 +0000 |
|---|---|---|
| committer | Jan Malakhovski <oxij@oxij.org> | 2019-02-03 15:33:15 +0000 |
| commit | 8e929441a9b4f5a0e3ef1d23487332fc46b5932b (patch) | |
| tree | c83114907b8aa4e50d3e694e1b3e7c2e6f6218ff /pkgs/development/libraries/opencv | |
| parent | 8abaf8dfe539a2d73782a0189cd09f6211fb6298 (diff) | |
opencv3, opencv4: move defaults to package file
Diffstat (limited to 'pkgs/development/libraries/opencv')
| -rw-r--r-- | pkgs/development/libraries/opencv/3.x.nix | 4 | ||||
| -rw-r--r-- | pkgs/development/libraries/opencv/4.x.nix | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/development/libraries/opencv/3.x.nix b/pkgs/development/libraries/opencv/3.x.nix index cca820e2f371..f1e82c166a12 100644 --- a/pkgs/development/libraries/opencv/3.x.nix +++ b/pkgs/development/libraries/opencv/3.x.nix @@ -8,13 +8,13 @@ , enablePNG ? true, libpng , enableTIFF ? true, libtiff , enableWebP ? true, libwebp -, enableEXR ? (!stdenv.isDarwin), openexr, ilmbase +, enableEXR ? !stdenv.isDarwin, openexr, ilmbase , enableJPEG2K ? true, jasper , enableEigen ? true, eigen , enableOpenblas ? true, openblas , enableContrib ? true -, enableCuda ? (config.cudaSupport or false), cudatoolkit +, enableCuda ? config.cudaSupport or false, cudatoolkit , enableUnfree ? false , enableIpp ? false diff --git a/pkgs/development/libraries/opencv/4.x.nix b/pkgs/development/libraries/opencv/4.x.nix index 3f21ee15bf3f..8addc150555d 100644 --- a/pkgs/development/libraries/opencv/4.x.nix +++ b/pkgs/development/libraries/opencv/4.x.nix @@ -8,13 +8,13 @@ , enablePNG ? true, libpng , enableTIFF ? true, libtiff , enableWebP ? true, libwebp -, enableEXR ? (!stdenv.isDarwin), openexr, ilmbase +, enableEXR ? !stdenv.isDarwin, openexr, ilmbase , enableJPEG2K ? true, jasper , enableEigen ? true, eigen , enableOpenblas ? true, openblas , enableContrib ? true -, enableCuda ? (config.cudaSupport or false), cudatoolkit +, enableCuda ? config.cudaSupport or false, cudatoolkit , enableUnfree ? false , enableIpp ? false |