Merge pull request #138237 from marsam/fix-opencv-staging

opencv: fix build
This commit is contained in:
Luke Granger-Brown
2021-09-17 13:28:29 +01:00
committed by GitHub
@@ -1,6 +1,7 @@
{ lib
, stdenv
, fetchurl
, fetchpatch
, fetchFromGitHub
, cmake
, pkg-config
@@ -217,6 +218,11 @@ stdenv.mkDerivation {
# Ensures that we use the system OpenEXR rather than the vendored copy of the source included with OpenCV.
patches = [
./cmake-don-t-use-OpenCVFindOpenEXR.patch
# Fix usage of deprecated version of protobuf' SetTotalBytesLimit. Remove with the next release.
(fetchpatch {
url = "https://github.com/opencv/opencv/commit/384875f4fcf1782b10699a379aa245a03cb27a04.patch";
sha256 = "1agwd0pm07m2dy8a62vmfl4n73dsmsdll2a73q6kara9wm3jlp41";
})
] ++ lib.optional enableCuda ./cuda_opt_flow.patch;
# This prevents cmake from using libraries in impure paths (which