ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-12-29 14:57:28 +03:00
Code Issues Projects Releases Wiki Activity

opencv4: fix OpenCV issue 13207

Browse Source 
This is the same fix as for opencv3 in commit:
2572dd11accf701feeefd6fd4ee45be98cb47016
This commit is contained in:
Bas van Dijk 2018-12-20 09:45:37 +01:00
parent 49965e61d7
commit 6267a02d9c
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/development/libraries/opencv/4.x.nix
View File

@ -160,7 +160,15 @@ stdenv.mkDerivation rec {
cp --no-preserve=mode -r "${contribSrc}/modules" "$NIX_BUILD_TOP/source/opencv_contrib"
'';
patches =
patches = [
# https://github.com/opencv/opencv/pull/13232
# This also fixes the test of haskell-opencv HEAD where we got the following error:
# libgomp: Out of memory allocating 927712937064 bytes
(fetchpatch {
url = https://github.com/opencv/opencv/commit/e1ac8589f8a19b9bf5598bbae073ae12721c541d.patch;
sha256 = "1ap2818lixjhc5jgf779c57kwacafc0ap40lqrx6nqfz31silglj";
})
] ++
# Fixes issue: https://github.com/opencv/opencv_contrib/issues/1923
# PR: https://github.com/opencv/opencv_contrib/pull/1913
lib.optional buildContrib (fetchpatch {