From 6d455dd1f8f47c4a3c9dc879676176f2c9232237 Mon Sep 17 00:00:00 2001 From: risicle Date: Thu, 29 Dec 2016 16:23:29 +0000 Subject: [PATCH] opencv 3.1.0: add patch fixing python use of FlannBasedMatcher.add (#21086) Patch is from https://github.com/opencv/opencv/pull/6009. Upstream doesn't seem particularly enthusiastic about a 3.1.x point release, so who knows when this fix would otherwise see the light of day. --- pkgs/development/libraries/opencv/3.x.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/opencv/3.x.nix b/pkgs/development/libraries/opencv/3.x.nix index 388167319c12..978b28aaa480 100644 --- a/pkgs/development/libraries/opencv/3.x.nix +++ b/pkgs/development/libraries/opencv/3.x.nix @@ -52,7 +52,11 @@ stdenv.mkDerivation rec { url = "https://github.com/opencv/opencv/commit/d76f258aebdf63f979a205cabe6d3e81700a7cd8.patch"; sha256 = "00b3msfgrcw7laij6qafn4b18c1dl96xxpzwx05wxzrjldqb6kqg"; }) - ]; + ] + ++ lib.optional enablePython (fetchpatch { # Patch to fix FlannBasedMatcher under python + url = "https://github.com/opencv/opencv/commit/05cfe28612fd8dc8fb0ccb876df945c7b435dd26.patch"; + sha256 = "0niza5lybr1ljzdkyiapr16laa468168qinpy5qn00yimnaygpm6"; + }); preConfigure = let ippicvVersion = "20151201";