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: 2edd48b4fd68
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: bf5e3c24d0d1
Choose a head ref
  • 2 commits
  • 1 file changed
  • 1 contributor

Commits on Jun 15, 2019

  1. opencv: 3.4.5 -> 3.4.6

    @basvandijk
    basvandijk committed Jun 15, 2019
    Copy the full SHA
    9f52f0e View commit details

Commits on Jun 16, 2019

  1. Merge pull request #63162 from basvandijk/opencv-3.4.6 

    opencv: 3.4.5 -> 3.4.6
    @basvandijk
    basvandijk authored Jun 16, 2019
    Copy the full SHA
    bf5e3c2 View commit details
Showing with 9 additions and 3 deletions.
  1. +9 −3 pkgs/development/libraries/opencv/3.x.nix
12 changes: 9 additions & 3 deletions pkgs/development/libraries/opencv/3.x.nix
View file
Original file line number Diff line number Diff line change
@@ -35,20 +35,20 @@
}:

let
version = "3.4.5";
version = "3.4.6";

src = fetchFromGitHub {
owner = "opencv";
repo = "opencv";
rev = version;
sha256 = "0hz9316ys2qi0lx9dcbsk3mkn8cn08q12hc96p6zz2d4is6d5wsc";
sha256 = "1gf0rbgd5s13q46bdna0bqn4yz9rxfhvlhbp5ds9hs326q8zprg8";
};

contribSrc = fetchFromGitHub {
owner = "opencv";
repo = "opencv_contrib";
rev = version;
sha256 = "1fw7qwgibiznqal2dg4alkw8hrrrpjc0jaicf2406604rjm2lx6h";
sha256 = "115qcq0k2wmvhxw5lyv14yrd8m6xq3qy0pdby90ml2yl1caymbfy";
};

# Contrib must be built in order to enable Tesseract support:
@@ -147,6 +147,12 @@ stdenv.mkDerivation rec {
cp --no-preserve=mode -r "${contribSrc}/modules" "$NIX_BUILD_TOP/opencv_contrib"
'';

patches = lib.optional stdenv.isDarwin
(fetchpatch {
url = "https://github.com/opencv/opencv/commit/7621b91769098359e893e68ad474040ca7940fa1.patch";
sha256 = "12qb14yd5934ig61lzs4pg29gak9wjyhnj7nmfx5r213jj1a4m21";
});

# This prevents cmake from using libraries in impure paths (which
# causes build failure on non NixOS)
# Also, work around https://github.com/NixOS/nixpkgs/issues/26304 with