diff options
| author | Chris Hodapp <hodapp87@gmail.com> | 2017-07-26 21:03:51 -0400 |
|---|---|---|
| committer | Chris Hodapp <hodapp87@gmail.com> | 2017-07-26 21:03:51 -0400 |
| commit | 70bbd5e84a01dcb25b277b518592f220fa922789 (patch) | |
| tree | 6dfe0be50e41001aca678a9d91cee6e4e0548bc4 | |
| parent | d4ef5ac0e962bd6604dda38617c4b98c77a62949 (diff) | |
| download | nixlib-70bbd5e84a01dcb25b277b518592f220fa922789.tar nixlib-70bbd5e84a01dcb25b277b518592f220fa922789.tar.gz nixlib-70bbd5e84a01dcb25b277b518592f220fa922789.tar.bz2 nixlib-70bbd5e84a01dcb25b277b518592f220fa922789.tar.lz nixlib-70bbd5e84a01dcb25b277b518592f220fa922789.tar.xz nixlib-70bbd5e84a01dcb25b277b518592f220fa922789.tar.zst nixlib-70bbd5e84a01dcb25b277b518592f220fa922789.zip | |
opencv: Work around build failure with enableContrib & Python
| -rw-r--r-- | pkgs/development/libraries/opencv/3.x.nix | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/pkgs/development/libraries/opencv/3.x.nix b/pkgs/development/libraries/opencv/3.x.nix index 85b4d5627201..0443d00a258d 100644 --- a/pkgs/development/libraries/opencv/3.x.nix +++ b/pkgs/development/libraries/opencv/3.x.nix @@ -90,9 +90,14 @@ stdenv.mkDerivation rec { done ''); - # This prevents cmake from using libraries in impure paths (which causes build failure on non NixOS) + # 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 + # what appears to be some stray headers in dnn/misc/tensorflow + # in contrib when generating the Python bindings: postPatch = '' sed -i '/Add these standard paths to the search paths for FIND_LIBRARY/,/^\s*$/{d}' CMakeLists.txt + sed -i -e 's|if len(decls) == 0:|if len(decls) == 0 or "opencv2/" not in hdr:|' ./modules/python/src2/gen2.py ''; preConfigure = |