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

opencv-3.x: fix build on OS X

This commit is contained in:
Bas van Dijk 2017-06-17 19:57:39 +02:00
parent fd92d817a3
commit 2265f50a51
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"; 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 { vggFiles = fetchFromGitHub {
owner = "opencv"; owner = "opencv";
repo = "opencv_3rdparty"; repo = "opencv_3rdparty";
@ -61,6 +68,9 @@ stdenv.mkDerivation rec {
(lib.optionalString enableContrib '' (lib.optionalString enableContrib ''
cp --no-preserve=mode -r "${contribSrc}/modules" "$NIX_BUILD_TOP/opencv_contrib" 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 \ for name in vgg_generated_48.i \
vgg_generated_64.i \ vgg_generated_64.i \
vgg_generated_80.i \ vgg_generated_80.i \