diff options
author | Ryan Burns <rtburns@protonmail.com> | 2021-09-17 18:45:35 -0700 |
---|---|---|
committer | Ryan Burns <rtburns@protonmail.com> | 2021-09-17 18:51:54 -0700 |
commit | ab1ec682ac4e8af4617e191e5ac75d3ba5015620 (patch) | |
tree | d19cf97f3160a7ea2b7ab280c07e1ab2ed44f789 /pkgs/development/libraries/opencv | |
parent | a2645154932a3422ebec391436d3695daefedb5c (diff) |
opencv3: fix build
Diffstat (limited to 'pkgs/development/libraries/opencv')
-rw-r--r-- | pkgs/development/libraries/opencv/3.x.nix | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/pkgs/development/libraries/opencv/3.x.nix b/pkgs/development/libraries/opencv/3.x.nix index fcc6238500f1c..dfb67b6a12a7a 100644 --- a/pkgs/development/libraries/opencv/3.x.nix +++ b/pkgs/development/libraries/opencv/3.x.nix @@ -1,5 +1,6 @@ { lib, stdenv , fetchFromGitHub +, fetchpatch , cmake, pkg-config, unzip, zlib, pcre, hdf5 , glog, boost, gflags, protobuf , config @@ -154,6 +155,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"; + }) ]; # This prevents cmake from using libraries in impure paths (which |