diff options
| author | Bas van Dijk <v.dijk.bas@gmail.com> | 2019-06-15 16:31:58 +0200 |
|---|---|---|
| committer | Bas van Dijk <v.dijk.bas@gmail.com> | 2019-06-15 16:54:31 +0200 |
| commit | 9f52f0e6b879f900883ca2efaced363a02ccd851 (patch) | |
| tree | 9f027ea485e2adb1d2f8051a27feec97f7bd18f5 /pkgs/development/libraries/opencv | |
| parent | b8c827c2660f9ee63b905ccddbfa794b410d86b9 (diff) | |
| download | nixpkgs-9f52f0e6b879f900883ca2efaced363a02ccd851.tar nixpkgs-9f52f0e6b879f900883ca2efaced363a02ccd851.tar.gz nixpkgs-9f52f0e6b879f900883ca2efaced363a02ccd851.tar.bz2 nixpkgs-9f52f0e6b879f900883ca2efaced363a02ccd851.tar.lz nixpkgs-9f52f0e6b879f900883ca2efaced363a02ccd851.tar.xz nixpkgs-9f52f0e6b879f900883ca2efaced363a02ccd851.tar.zst nixpkgs-9f52f0e6b879f900883ca2efaced363a02ccd851.zip | |
opencv: 3.4.5 -> 3.4.6
Diffstat (limited to 'pkgs/development/libraries/opencv')
| -rw-r--r-- | pkgs/development/libraries/opencv/3.x.nix | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/pkgs/development/libraries/opencv/3.x.nix b/pkgs/development/libraries/opencv/3.x.nix index 676666d7f47..b0652176c94 100644 --- a/pkgs/development/libraries/opencv/3.x.nix +++ b/pkgs/development/libraries/opencv/3.x.nix @@ -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 |