diff options
| author | Bas van Dijk <v.dijk.bas@gmail.com> | 2018-12-20 09:26:17 +0100 |
|---|---|---|
| committer | Bas van Dijk <v.dijk.bas@gmail.com> | 2018-12-20 10:49:40 +0100 |
| commit | 49965e61d70529ced38560dab2b822ecaa5aa40d (patch) | |
| tree | c197966b2da44cf4bfd01b3268ce04853a8d2615 /pkgs/development/libraries/opencv | |
| parent | 96952fe63b030f91f009fdb19510f1d78975ff08 (diff) | |
| download | nixpkgs-49965e61d70529ced38560dab2b822ecaa5aa40d.tar nixpkgs-49965e61d70529ced38560dab2b822ecaa5aa40d.tar.gz nixpkgs-49965e61d70529ced38560dab2b822ecaa5aa40d.tar.bz2 nixpkgs-49965e61d70529ced38560dab2b822ecaa5aa40d.tar.lz nixpkgs-49965e61d70529ced38560dab2b822ecaa5aa40d.tar.xz nixpkgs-49965e61d70529ced38560dab2b822ecaa5aa40d.tar.zst nixpkgs-49965e61d70529ced38560dab2b822ecaa5aa40d.zip | |
opencv3: fix OpenCV issue 13207
See: https://github.com/opencv/opencv/pull/13232
This also fixes the test of haskell-opencv HEAD where we got the
following error:
Feature Detection
houghLinesP:
libgomp: Out of memory allocating 927712937064 bytes
Test suite test-opencv: FAIL
Diffstat (limited to 'pkgs/development/libraries/opencv')
| -rw-r--r-- | pkgs/development/libraries/opencv/3.x.nix | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/pkgs/development/libraries/opencv/3.x.nix b/pkgs/development/libraries/opencv/3.x.nix index f948cbb062f..01d15416dd7 100644 --- a/pkgs/development/libraries/opencv/3.x.nix +++ b/pkgs/development/libraries/opencv/3.x.nix @@ -147,7 +147,15 @@ stdenv.mkDerivation rec { cp --no-preserve=mode -r "${contribSrc}/modules" "$NIX_BUILD_TOP/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"; + }) + ] ++ # https://github.com/opencv/opencv/pull/13254 lib.optional enablePython (fetchpatch { url = https://github.com/opencv/opencv/commit/ad35b79e3f98b4ce30481e0299cca550ed77aef0.patch; |