nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-25 08:23:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

opencv 3.1.0: add patch fixing python use of FlannBasedMatcher.add (#21086)

Browse Source 
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.
This commit is contained in:
risicle 2016-12-29 16:23:29 +00:00 committed by Franz Pletz
parent 3e84523ed7
commit 6d455dd1f8
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/development/libraries/opencv/3.x.nix
View File

@ -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";