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 | |
parent | 8abaf8dfe539a2d73782a0189cd09f6211fb6298 (diff) | |
download | nixpkgs-8e929441a9b4f5a0e3ef1d23487332fc46b5932b.tar nixpkgs-8e929441a9b4f5a0e3ef1d23487332fc46b5932b.tar.gz nixpkgs-8e929441a9b4f5a0e3ef1d23487332fc46b5932b.tar.bz2 nixpkgs-8e929441a9b4f5a0e3ef1d23487332fc46b5932b.tar.lz nixpkgs-8e929441a9b4f5a0e3ef1d23487332fc46b5932b.tar.xz nixpkgs-8e929441a9b4f5a0e3ef1d23487332fc46b5932b.tar.zst nixpkgs-8e929441a9b4f5a0e3ef1d23487332fc46b5932b.zip |
opencv3, opencv4: move defaults to package file
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/development/libraries/opencv/3.x.nix | 4 | ||||
-rw-r--r-- | pkgs/development/libraries/opencv/4.x.nix | 4 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
3 files changed, 4 insertions, 6 deletions
diff --git a/pkgs/development/libraries/opencv/3.x.nix b/pkgs/development/libraries/opencv/3.x.nix index cca820e2f37..f1e82c166a1 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 3f21ee15bf3..8addc150555 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 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ce595b3e4f7..b89426b8cd0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11868,7 +11868,6 @@ in }; opencv3 = callPackage ../development/libraries/opencv/3.x.nix { - enableCuda = config.cudaSupport or false; inherit (darwin) cf-private; inherit (darwin.apple_sdk.frameworks) AVFoundation Cocoa QTKit VideoDecodeAcceleration; }; @@ -11878,7 +11877,6 @@ in }; opencv4 = callPackage ../development/libraries/opencv/4.x.nix { - enableCuda = config.cudaSupport or false; inherit (darwin) cf-private; inherit (darwin.apple_sdk.frameworks) AVFoundation Cocoa QTKit VideoDecodeAcceleration; }; |