Skip to content

Commit 59ed7ca

Browse files
authored
opencv3: build with openexr 3 (NixOS#279918)
Confirmed to pick up OpenEXR 3 correctly, has no dependencies
1 parent bdcaec1 commit 59ed7ca

1 file changed

Lines changed: 2 additions & 4 deletions

File tree

  • pkgs/development/libraries/opencv

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

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
, enablePNG ? true, libpng
1111
, enableTIFF ? true, libtiff
1212
, enableWebP ? true, libwebp
13-
, enableEXR ? !stdenv.isDarwin, openexr, ilmbase
13+
, enableEXR ? !stdenv.isDarwin, openexr_3
1414
, enableEigen ? true, eigen
1515
, enableOpenblas ? true, openblas, blas, lapack
1616
, enableContrib ? true
@@ -194,7 +194,7 @@ stdenv.mkDerivation {
194194
++ lib.optional enablePNG libpng
195195
++ lib.optional enableTIFF libtiff
196196
++ lib.optional enableWebP libwebp
197-
++ lib.optionals enableEXR [ openexr ilmbase ]
197+
++ lib.optionals enableEXR [ openexr_3 ]
198198
++ lib.optional enableFfmpeg ffmpeg
199199
++ lib.optionals (enableFfmpeg && stdenv.isDarwin)
200200
[ VideoDecodeAcceleration bzip2 ]
@@ -219,8 +219,6 @@ stdenv.mkDerivation {
219219

220220
nativeBuildInputs = [ cmake pkg-config unzip ];
221221

222-
env.NIX_CFLAGS_COMPILE = lib.optionalString enableEXR "-I${ilmbase.dev}/include/OpenEXR";
223-
224222
# Configure can't find the library without this.
225223
OpenBLAS_HOME = lib.optionalString enableOpenblas openblas;
226224

0 commit comments

Comments
 (0)