Unverified Commit 59ed7cae authored by Yureka's avatar Yureka Committed by GitHub
Browse files

opencv3: build with openexr 3 (#279918) 

Confirmed to pick up OpenEXR 3 correctly, has no dependencies
parent bdcaec10

pkgs/development/libraries/opencv/3.x.nix

+2 −4
Original line number Diff line number Diff line
@@ -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;