diff options
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/opencv/3.x.nix')
| -rw-r--r-- | nixpkgs/pkgs/development/libraries/opencv/3.x.nix | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/nixpkgs/pkgs/development/libraries/opencv/3.x.nix b/nixpkgs/pkgs/development/libraries/opencv/3.x.nix index e3f458d0d733..377ebb3acdb5 100644 --- a/nixpkgs/pkgs/development/libraries/opencv/3.x.nix +++ b/nixpkgs/pkgs/development/libraries/opencv/3.x.nix @@ -10,7 +10,7 @@ , enablePNG ? true, libpng , enableTIFF ? true, libtiff , enableWebP ? true, libwebp -, enableEXR ? !stdenv.isDarwin, openexr, ilmbase +, enableEXR ? !stdenv.isDarwin, openexr_3 , enableEigen ? true, eigen , enableOpenblas ? true, openblas, blas, lapack , enableContrib ? true @@ -194,7 +194,7 @@ stdenv.mkDerivation { ++ lib.optional enablePNG libpng ++ lib.optional enableTIFF libtiff ++ lib.optional enableWebP libwebp - ++ lib.optionals enableEXR [ openexr ilmbase ] + ++ lib.optionals enableEXR [ openexr_3 ] ++ lib.optional enableFfmpeg ffmpeg ++ lib.optionals (enableFfmpeg && stdenv.isDarwin) [ VideoDecodeAcceleration bzip2 ] @@ -219,8 +219,6 @@ stdenv.mkDerivation { nativeBuildInputs = [ cmake pkg-config unzip ]; - env.NIX_CFLAGS_COMPILE = lib.optionalString enableEXR "-I${ilmbase.dev}/include/OpenEXR"; - # Configure can't find the library without this. OpenBLAS_HOME = lib.optionalString enableOpenblas openblas; |