public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

opencv: fix python bindings (#106972)

Browse Source 
Fixes partially broken Python bindings (#91791) by removing workaround (#26304) no longer needed in the 4.x series.
This commit is contained in:
Thomas 2020-12-16 18:12:29 -06:00 committed by GitHub
parent 120a14e6aa
commit c322b7cfce
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/libraries/opencv/4.x.nix
View File

@ -162,15 +162,11 @@ stdenv.mkDerivation {
# This prevents cmake from using libraries in impure paths (which # This prevents cmake from using libraries in impure paths (which
# causes build failure on non NixOS) # 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 = [ patches = [
./cmake-don-t-use-OpenCVFindOpenEXR.patch ./cmake-don-t-use-OpenCVFindOpenEXR.patch
] ++ lib.optional enableCuda ./cuda_opt_flow.patch; ] ++ lib.optional enableCuda ./cuda_opt_flow.patch;
postPatch = '' postPatch = ''
sed -i '/Add these standard paths to the search paths for FIND_LIBRARY/,/^\s*$/{d}' CMakeLists.txt 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 = preConfigure =