alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

Merge pull request #26673 from LumiGuide/fix-opencv-contrib-osx

Browse source 
opencv-3.x: fix build on OS X
This commit is contained in:
Daiderd Jordan 2017-06-18 17:11:59 +02:00 committed by GitHub
parent 92fc4a374f 2265f50a51
commit 7c90c45856
1 changed files with 10 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
pkgs/development/libraries/opencv/3.x.nix
View file

@ -36,6 +36,13 @@ let
sha256 = "1lynpbxz1jay3ya5y45zac5v8c6ifgk4ssn8d1chfdk3spi691jj";
};
# This fixes the build on OS X.
# See: https://github.com/opencv/opencv_contrib/pull/926
contribOSXFix = fetchpatch {
url = "https://github.com/opencv/opencv_contrib/commit/abf44fcccfe2f281b7442dac243e37b7f436d961.patch";
sha256 = "11dsq8dwh1k6f7zglbc26xwsjw184ggf2531mhf7v77kd72k19fm";
};
vggFiles = fetchFromGitHub {
owner = "opencv";
repo = "opencv_3rdparty";
@ -61,6 +68,9 @@ stdenv.mkDerivation rec {
(lib.optionalString enableContrib ''
cp --no-preserve=mode -r "${contribSrc}/modules" "$NIX_BUILD_TOP/opencv_contrib"
# This fixes the build on OS X.
patch -d "$NIX_BUILD_TOP/opencv_contrib" -p2 < "${contribOSXFix}"
for name in vgg_generated_48.i \
vgg_generated_64.i \
vgg_generated_80.i \