@@ -1,7 +1,6 @@
11{ lib
22, stdenv
33, fetchurl
4−, fetchpatch
54, fetchFromGitHub
65, cmake
76, pkg-config
@@ -74,20 +73,20 @@
7473}:
7574
7675let
77− version = "4.5.2";
76+ version = "4.5.4";
7877
7978 src = fetchFromGitHub {
8079 owner = "opencv";
8180 repo = "opencv";
8281 rev = version;
83− sha256 = "sha256-pxi1VBF4txvRqspdqvCsAQ3XKzl633/o3wyOgD9wid4=";
82+ sha256 = "sha256-eIESkc/yYiZZ5iY4t/rAPd+jfjuMYR3srCBC4fO3g70=";
8483 };
8584
8685 contribSrc = fetchFromGitHub {
8786 owner = "opencv";
8887 repo = "opencv_contrib";
8988 rev = version;
90− sha256 = "sha256-iMenRTY+qeL7WRgnRuQbsHflYDakE7pWWSHeIjrg0Iw=";
89+ sha256 = "sha256-RkCIGukZ8KJkmVZQAZTWdVcVKD2I3NcfGShcqzKhQD0=";
9190 };
9291
9392 # Contrib must be built in order to enable Tesseract support:
@@ -219,11 +218,6 @@ stdenv.mkDerivation {
219218 # Ensures that we use the system OpenEXR rather than the vendored copy of the source included with OpenCV.
220219 patches = [
221220 ./cmake-don-t-use-OpenCVFindOpenEXR.patch
222− # Fix usage of deprecated version of protobuf' SetTotalBytesLimit. Remove with the next release.
223− (fetchpatch {
224− url = "https://github.com/opencv/opencv/commit/384875f4fcf1782b10699a379aa245a03cb27a04.patch";
225− sha256 = "1agwd0pm07m2dy8a62vmfl4n73dsmsdll2a73q6kara9wm3jlp41";
226− })
227221 ] ++ lib.optional enableCuda ./cuda_opt_flow.patch;
228222
229223 # This prevents cmake from using libraries in impure paths (which