Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 92fc4a374f57
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 7c90c458566a
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Jun 17, 2017

  1. opencv-3.x: fix build on OS X

    @basvandijk
    basvandijk committed Jun 17, 2017
    Copy the full SHA
    2265f50 View commit details

Commits on Jun 18, 2017

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

    opencv-3.x: fix build on OS X
    @LnL7
    LnL7 authored Jun 18, 2017
    Copy the full SHA
    7c90c45 View commit details
Showing with 10 additions and 0 deletions.
  1. +10 −0 pkgs/development/libraries/opencv/3.x.nix
10 changes: 10 additions & 0 deletions pkgs/development/libraries/opencv/3.x.nix
View file
Original file line number Diff line number Diff line change
@@ -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 \