diff options
| author | Bas van Dijk <v.dijk.bas@gmail.com> | 2017-06-17 19:57:39 +0200 |
|---|---|---|
| committer | Bas van Dijk <v.dijk.bas@gmail.com> | 2017-06-17 19:57:39 +0200 |
| commit | 2265f50a5144d69a6bead22d3cac29a590636fd2 (patch) | |
| tree | f37a5207ca0ab541a6fae04cd97c5ac698cb01d0 /pkgs/development/libraries/opencv | |
| parent | fd92d817a33c24041feba3df3c11dbc987b4f331 (diff) | |
| download | nixpkgs-2265f50a5144d69a6bead22d3cac29a590636fd2.tar nixpkgs-2265f50a5144d69a6bead22d3cac29a590636fd2.tar.gz nixpkgs-2265f50a5144d69a6bead22d3cac29a590636fd2.tar.bz2 nixpkgs-2265f50a5144d69a6bead22d3cac29a590636fd2.tar.lz nixpkgs-2265f50a5144d69a6bead22d3cac29a590636fd2.tar.xz nixpkgs-2265f50a5144d69a6bead22d3cac29a590636fd2.tar.zst nixpkgs-2265f50a5144d69a6bead22d3cac29a590636fd2.zip | |
opencv-3.x: fix build on OS X
Diffstat (limited to 'pkgs/development/libraries/opencv')
| -rw-r--r-- | pkgs/development/libraries/opencv/3.x.nix | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/pkgs/development/libraries/opencv/3.x.nix b/pkgs/development/libraries/opencv/3.x.nix index 5c7972eb2fa..dc4a00e6dd9 100644 --- a/pkgs/development/libraries/opencv/3.x.nix +++ b/pkgs/development/libraries/opencv/3.x.nix @@ -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 \ |