diff options
| author | Bas van Dijk <v.dijk.bas@gmail.com> | 2018-01-02 10:00:43 +0100 |
|---|---|---|
| committer | Orivej Desh <orivej@gmx.fr> | 2018-01-09 00:46:35 +0000 |
| commit | 9aad587cbb48be737c4ad3524aa6528704700e3b (patch) | |
| tree | bce9ae47ea466a9547381fe1cce66e7e63da160d | |
| parent | 6919867b3b624e0792258089899b06b90b3aac85 (diff) | |
| download | nixlib-9aad587cbb48be737c4ad3524aa6528704700e3b.tar nixlib-9aad587cbb48be737c4ad3524aa6528704700e3b.tar.gz nixlib-9aad587cbb48be737c4ad3524aa6528704700e3b.tar.bz2 nixlib-9aad587cbb48be737c4ad3524aa6528704700e3b.tar.lz nixlib-9aad587cbb48be737c4ad3524aa6528704700e3b.tar.xz nixlib-9aad587cbb48be737c4ad3524aa6528704700e3b.tar.zst nixlib-9aad587cbb48be737c4ad3524aa6528704700e3b.zip | |
opencv: have a better fix for the python bindings issue
| -rw-r--r-- | pkgs/development/libraries/opencv/3.x.nix | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/pkgs/development/libraries/opencv/3.x.nix b/pkgs/development/libraries/opencv/3.x.nix index 9b48c6176963..356e1e336ac2 100644 --- a/pkgs/development/libraries/opencv/3.x.nix +++ b/pkgs/development/libraries/opencv/3.x.nix @@ -1,5 +1,5 @@ { lib, stdenv -, fetchurl, fetchFromGitHub +, fetchurl, fetchFromGitHub, fetchpatch , cmake, pkgconfig, unzip, zlib, pcre, hdf5 , caffe, glog, boost, google-gflags, protobuf , config @@ -151,6 +151,14 @@ stdenv.mkDerivation rec { name = "opencv-${version}"; inherit version src; + patches = [ + # Fix for: https://github.com/opencv/opencv/issues/10474 + (fetchpatch { + url = "https://github.com/opencv/opencv/commit/ea5a3e557f93844fdb5e54e3e8acfc5f61c6fd9f.patch"; + sha256 = "1w7jmqlrx73ydh9jjsnnic5xz8r04kxbjpzkcfyb91v3az9132r1"; + }) + ]; + postUnpack = lib.optionalString buildContrib '' cp --no-preserve=mode -r "${contribSrc}/modules" "$NIX_BUILD_TOP/opencv_contrib" ''; @@ -242,11 +250,6 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - # Workaround for: https://github.com/opencv/opencv/issues/10474 - preBuild = '' - make opencv_dnn - ''; - postBuild = lib.optionalString enableDocs '' make doxygen ''; |