diff options
| author | Thomas <twatson52@icloud.com> | 2020-12-16 18:12:29 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-16 19:12:29 -0500 |
| commit | c322b7cfce44981da0e1c1892676032b51525f0b (patch) | |
| tree | dbdba2eea96677161d1ece7268c77efd20ed5a64 /pkgs/development/libraries/opencv | |
| parent | 120a14e6aa32114ce561c4f051fa7438d4ed7bd9 (diff) | |
| download | nixpkgs-c322b7cfce44981da0e1c1892676032b51525f0b.tar nixpkgs-c322b7cfce44981da0e1c1892676032b51525f0b.tar.gz nixpkgs-c322b7cfce44981da0e1c1892676032b51525f0b.tar.bz2 nixpkgs-c322b7cfce44981da0e1c1892676032b51525f0b.tar.lz nixpkgs-c322b7cfce44981da0e1c1892676032b51525f0b.tar.xz nixpkgs-c322b7cfce44981da0e1c1892676032b51525f0b.tar.zst nixpkgs-c322b7cfce44981da0e1c1892676032b51525f0b.zip | |
opencv: fix python bindings (#106972)
Fixes partially broken Python bindings (#91791) by removing workaround (#26304) no longer needed in the 4.x series.
Diffstat (limited to 'pkgs/development/libraries/opencv')
| -rw-r--r-- | pkgs/development/libraries/opencv/4.x.nix | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/pkgs/development/libraries/opencv/4.x.nix b/pkgs/development/libraries/opencv/4.x.nix index a723ded6bb6..c6547f118d0 100644 --- a/pkgs/development/libraries/opencv/4.x.nix +++ b/pkgs/development/libraries/opencv/4.x.nix @@ -162,15 +162,11 @@ stdenv.mkDerivation { # 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: patches = [ ./cmake-don-t-use-OpenCVFindOpenEXR.patch ] ++ lib.optional enableCuda ./cuda_opt_flow.patch; 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 = |