diff options
| author | Vladimír Čunát <v@cunat.cz> | 2021-09-20 12:32:03 +0200 |
|---|---|---|
| committer | Vladimír Čunát <v@cunat.cz> | 2021-09-20 12:32:03 +0200 |
| commit | 4cd9e898cb301d1287a213c11e3b01fe41a3f655 (patch) | |
| tree | 2deeed55a8823edda7700c36312f6e9b69679086 /pkgs/development/libraries/opencv | |
| parent | b4f1a1338f8c7259ba1787f8981200eb832b975c (diff) | |
| parent | ab1ec682ac4e8af4617e191e5ac75d3ba5015620 (diff) | |
| download | nixpkgs-4cd9e898cb301d1287a213c11e3b01fe41a3f655.tar nixpkgs-4cd9e898cb301d1287a213c11e3b01fe41a3f655.tar.gz nixpkgs-4cd9e898cb301d1287a213c11e3b01fe41a3f655.tar.bz2 nixpkgs-4cd9e898cb301d1287a213c11e3b01fe41a3f655.tar.lz nixpkgs-4cd9e898cb301d1287a213c11e3b01fe41a3f655.tar.xz nixpkgs-4cd9e898cb301d1287a213c11e3b01fe41a3f655.tar.zst nixpkgs-4cd9e898cb301d1287a213c11e3b01fe41a3f655.zip | |
Merge #138353: opencv3: fix build (into staging-next)
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 fcc6238500f..dfb67b6a12a 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 |