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 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ce595b3e4f7d..b89426b8cd0d 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; };