dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

opencv3: build with openexr 3 (#279918)

Browse Source 
Confirmed to pick up OpenEXR 3 correctly, has no dependencies
This commit is contained in:
Yureka 2024-01-16 12:03:57 +01:00 committed by GitHub
parent bdcaec105d
commit 59ed7caeed
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/development/libraries/opencv/3.x.nix
View File

@ -10,7 +10,7 @@
, enablePNG ? true, libpng , enablePNG ? true, libpng
, enableTIFF ? true, libtiff , enableTIFF ? true, libtiff
, enableWebP ? true, libwebp , enableWebP ? true, libwebp
, enableEXR ? !stdenv.isDarwin, openexr, ilmbase , enableEXR ? !stdenv.isDarwin, openexr_3
, enableEigen ? true, eigen , enableEigen ? true, eigen
, enableOpenblas ? true, openblas, blas, lapack , enableOpenblas ? true, openblas, blas, lapack
, enableContrib ? true , enableContrib ? true
@ -194,7 +194,7 @@ stdenv.mkDerivation {
++ lib.optional enablePNG libpng ++ lib.optional enablePNG libpng
++ lib.optional enableTIFF libtiff ++ lib.optional enableTIFF libtiff
++ lib.optional enableWebP libwebp ++ lib.optional enableWebP libwebp
++ lib.optionals enableEXR [ openexr ilmbase ] ++ lib.optionals enableEXR [ openexr_3 ]
++ lib.optional enableFfmpeg ffmpeg ++ lib.optional enableFfmpeg ffmpeg
++ lib.optionals (enableFfmpeg && stdenv.isDarwin) ++ lib.optionals (enableFfmpeg && stdenv.isDarwin)
[ VideoDecodeAcceleration bzip2 ] [ VideoDecodeAcceleration bzip2 ]
@ -219,8 +219,6 @@ stdenv.mkDerivation {
nativeBuildInputs = [ cmake pkg-config unzip ]; 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. # Configure can't find the library without this.
OpenBLAS_HOME = lib.optionalString enableOpenblas openblas; OpenBLAS_HOME = lib.optionalString enableOpenblas openblas;