diff options
| author | Bas van Dijk <v.dijk.bas@gmail.com> | 2018-12-24 23:33:16 +0100 |
|---|---|---|
| committer | Bas van Dijk <v.dijk.bas@gmail.com> | 2018-12-24 23:37:12 +0100 |
| commit | e36ab216ecedd75ce7b23e321fb84eb11fba179b (patch) | |
| tree | a1986b0e890c5455a9f8643a70a3d30d56a4d221 /pkgs/development/libraries/opencv | |
| parent | 8b145277bf4c7fd5db04903ce92f4d16d0b3f705 (diff) | |
| download | nixpkgs-e36ab216ecedd75ce7b23e321fb84eb11fba179b.tar nixpkgs-e36ab216ecedd75ce7b23e321fb84eb11fba179b.tar.gz nixpkgs-e36ab216ecedd75ce7b23e321fb84eb11fba179b.tar.bz2 nixpkgs-e36ab216ecedd75ce7b23e321fb84eb11fba179b.tar.lz nixpkgs-e36ab216ecedd75ce7b23e321fb84eb11fba179b.tar.xz nixpkgs-e36ab216ecedd75ce7b23e321fb84eb11fba179b.tar.zst nixpkgs-e36ab216ecedd75ce7b23e321fb84eb11fba179b.zip | |
opencv4: opencv_contrib: 4.0.0 -> 4.0.1
Diffstat (limited to 'pkgs/development/libraries/opencv')
| -rw-r--r-- | pkgs/development/libraries/opencv/4.x.nix | 18 |
1 files changed, 3 insertions, 15 deletions
diff --git a/pkgs/development/libraries/opencv/4.x.nix b/pkgs/development/libraries/opencv/4.x.nix index ecd320fe556..3f21ee15bf3 100644 --- a/pkgs/development/libraries/opencv/4.x.nix +++ b/pkgs/development/libraries/opencv/4.x.nix @@ -1,5 +1,5 @@ { lib, stdenv -, fetchurl, fetchFromGitHub, fetchpatch +, fetchurl, fetchFromGitHub , cmake, pkgconfig, unzip, zlib, pcre, hdf5 , glog, boost, google-gflags, protobuf , config @@ -47,10 +47,8 @@ let contribSrc = fetchFromGitHub { owner = "opencv"; repo = "opencv_contrib"; - # TODO: set to `version` when opencv_contrib-4.0.1 is released; - # See: http://answers.opencv.org/question/205793/will-there-be-a-opencv_contrib-401-release-now-that-opencv-401-is-out/ - rev = "4.0.0"; - sha256 = "1g4pzw7hv1v9jp1nrqjxqwpi1byl3mxkj6w6ibq6ydsn0138p66z"; + rev = version; + sha256 = "0svw8f6nvnzmrc0baj6priq4hbijla4kl6gzy8yif1jfvcwb1syy"; }; # Contrib must be built in order to enable Tesseract support: @@ -162,16 +160,6 @@ stdenv.mkDerivation rec { cp --no-preserve=mode -r "${contribSrc}/modules" "$NIX_BUILD_TOP/source/opencv_contrib" ''; - patches = - # Fixes issue: https://github.com/opencv/opencv_contrib/issues/1923 - # PR: https://github.com/opencv/opencv_contrib/pull/1913 - lib.optional buildContrib (fetchpatch { - url = https://github.com/opencv/opencv_contrib/commit/e068b62a1432d4d5688693a9e20bf175dfaa9a3e.patch; - sha256 = "102mq1qgmla40hhj8mda70inhakdazm9agyah98kq9931scvf0c9"; - stripLen = 2; - extraPrefix = "opencv_contrib/"; - }); - # 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 |