diff options
author | Bas van Dijk <v.dijk.bas@gmail.com> | 2018-12-22 17:26:12 +0100 |
---|---|---|
committer | Bas van Dijk <v.dijk.bas@gmail.com> | 2018-12-22 17:26:12 +0100 |
commit | 8347028c214e3359317059cdfd8c6c312578d2e6 (patch) | |
tree | 5b5fe7a43aeb21d509ab4aa35b9fbe59210c563f /pkgs/development/libraries/opencv | |
parent | b2ea55787933b1bd0e2807165e45ea56939758b2 (diff) |
opencv4: 4.0.0 -> 4.0.1
Diffstat (limited to 'pkgs/development/libraries/opencv')
-rw-r--r-- | pkgs/development/libraries/opencv/4.x.nix | 23 |
1 files changed, 6 insertions, 17 deletions
diff --git a/pkgs/development/libraries/opencv/4.x.nix b/pkgs/development/libraries/opencv/4.x.nix index c90ed76b53466..ecd320fe556fc 100644 --- a/pkgs/development/libraries/opencv/4.x.nix +++ b/pkgs/development/libraries/opencv/4.x.nix @@ -35,19 +35,21 @@ }: let - version = "4.0.0"; + version = "4.0.1"; src = fetchFromGitHub { owner = "opencv"; repo = "opencv"; rev = version; - sha256 = "1r2hszm4044dfx65wv69rcs419jjd7bqllhnpcwk3n28f5ahln50"; + sha256 = "1f0n2a57sn47w55vaxlwhr3g6xgchvr3gxicxbkyzai3pvj55k48"; }; contribSrc = fetchFromGitHub { owner = "opencv"; repo = "opencv_contrib"; - rev = version; + # TODO: set to `version` when opencv_contrib-4.0.1 is released; + # See: http://answers.opencv.org/question/205793/will-there-be-a-opencv_contrib-401-release-now-that-opencv-401-is-out/ + rev = "4.0.0"; sha256 = "1g4pzw7hv1v9jp1nrqjxqwpi1byl3mxkj6w6ibq6ydsn0138p66z"; }; @@ -160,15 +162,7 @@ stdenv.mkDerivation rec { cp --no-preserve=mode -r "${contribSrc}/modules" "$NIX_BUILD_TOP/source/opencv_contrib" ''; - 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"; - }) - ] ++ + patches = # Fixes issue: https://github.com/opencv/opencv_contrib/issues/1923 # PR: https://github.com/opencv/opencv_contrib/pull/1913 lib.optional buildContrib (fetchpatch { @@ -176,11 +170,6 @@ stdenv.mkDerivation rec { sha256 = "102mq1qgmla40hhj8mda70inhakdazm9agyah98kq9931scvf0c9"; stripLen = 2; extraPrefix = "opencv_contrib/"; - }) ++ - # https://github.com/opencv/opencv/pull/13254 - lib.optional enablePython (fetchpatch { - url = https://github.com/opencv/opencv/commit/ad35b79e3f98b4ce30481e0299cca550ed77aef0.patch; - sha256 = "0rkvg6wm5fyncszfpd83wa4lvsb8srvk21r1jcld758i4f334sws"; }); # This prevents cmake from using libraries in impure paths (which |