diff options
| author | Robert Scott <code@humanleg.org.uk> | 2022-07-27 21:55:50 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-07-27 21:55:50 +0100 |
| commit | cfca7fe8570065307abc9aada2173517d1ba8535 (patch) | |
| tree | db3c6c2df0389f1157ede580505eae4b6619c66f /pkgs/development/libraries/opencv | |
| parent | 9e58f0a78c6b285969440db97f9edb1eb8ddb7d5 (diff) | |
| parent | b21e1b5d1abcafa1b6e020e8b0338d307b624dc1 (diff) | |
| download | nixpkgs-cfca7fe8570065307abc9aada2173517d1ba8535.tar nixpkgs-cfca7fe8570065307abc9aada2173517d1ba8535.tar.gz nixpkgs-cfca7fe8570065307abc9aada2173517d1ba8535.tar.bz2 nixpkgs-cfca7fe8570065307abc9aada2173517d1ba8535.tar.lz nixpkgs-cfca7fe8570065307abc9aada2173517d1ba8535.tar.xz nixpkgs-cfca7fe8570065307abc9aada2173517d1ba8535.tar.zst nixpkgs-cfca7fe8570065307abc9aada2173517d1ba8535.zip | |
Merge pull request #182893 from kevinmehall/opencv-openjpeg
opencv: Use OpenJPEG from nixpkgs instead of vendored copy
Diffstat (limited to 'pkgs/development/libraries/opencv')
| -rw-r--r-- | pkgs/development/libraries/opencv/4.x.nix | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/pkgs/development/libraries/opencv/4.x.nix b/pkgs/development/libraries/opencv/4.x.nix index edc8acaa92b..ce7f9822335 100644 --- a/pkgs/development/libraries/opencv/4.x.nix +++ b/pkgs/development/libraries/opencv/4.x.nix @@ -26,6 +26,8 @@ , enableEXR ? !stdenv.isDarwin , openexr , ilmbase +, enableJPEG2000 ? true +, openjpeg , enableEigen ? true , eigen , enableOpenblas ? true @@ -256,6 +258,7 @@ stdenv.mkDerivation { ++ lib.optional enableTIFF libtiff ++ lib.optional enableWebP libwebp ++ lib.optionals enableEXR [ openexr ilmbase ] + ++ lib.optional enableJPEG2000 openjpeg ++ lib.optional enableFfmpeg ffmpeg ++ lib.optionals (enableFfmpeg && stdenv.isDarwin) [ VideoDecodeAcceleration bzip2 ] @@ -307,6 +310,8 @@ stdenv.mkDerivation { (opencvFlag "JPEG" enableJPEG) (opencvFlag "PNG" enablePNG) (opencvFlag "OPENEXR" enableEXR) + (opencvFlag "OPENJPEG" enableJPEG2000) + "-DWITH_JASPER=OFF" # OpenCV falls back to a vendored copy of Jasper when OpenJPEG is disabled (opencvFlag "CUDA" enableCuda) (opencvFlag "CUBLAS" enableCuda) (opencvFlag "TBB" enableTbb) |