public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

opencv4: 4.0.0 -> 4.0.1

Browse Source
This commit is contained in:
Bas van Dijk 2018-12-22 17:26:12 +01:00
parent b2ea557879
commit 8347028c21
1 changed files with 6 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -35,19 +35,21 @@
}: }:
let let
version = "4.0.0"; version = "4.0.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "opencv"; owner = "opencv";
repo = "opencv"; repo = "opencv";
rev = version; rev = version;
sha256 = "1r2hszm4044dfx65wv69rcs419jjd7bqllhnpcwk3n28f5ahln50"; sha256 = "1f0n2a57sn47w55vaxlwhr3g6xgchvr3gxicxbkyzai3pvj55k48";
}; };
contribSrc = fetchFromGitHub { contribSrc = fetchFromGitHub {
owner = "opencv"; owner = "opencv";
repo = "opencv_contrib"; 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"; sha256 = "1g4pzw7hv1v9jp1nrqjxqwpi1byl3mxkj6w6ibq6ydsn0138p66z";
}; };
@ -160,15 +162,7 @@ stdenv.mkDerivation rec {
cp --no-preserve=mode -r "${contribSrc}/modules" "$NIX_BUILD_TOP/source/opencv_contrib" 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 # Fixes issue: https://github.com/opencv/opencv_contrib/issues/1923
# PR: https://github.com/opencv/opencv_contrib/pull/1913 # PR: https://github.com/opencv/opencv_contrib/pull/1913
lib.optional buildContrib (fetchpatch { lib.optional buildContrib (fetchpatch {
@ -176,11 +170,6 @@ stdenv.mkDerivation rec {
sha256 = "102mq1qgmla40hhj8mda70inhakdazm9agyah98kq9931scvf0c9"; sha256 = "102mq1qgmla40hhj8mda70inhakdazm9agyah98kq9931scvf0c9";
stripLen = 2; stripLen = 2;
extraPrefix = "opencv_contrib/"; 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 # This prevents cmake from using libraries in impure paths (which