Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 120a14e6aa32
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: c322b7cfce44
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Dec 17, 2020

  1. opencv: fix python bindings (#106972) 

    Fixes partially broken Python bindings (#91791) by removing workaround (#26304) no longer needed in the 4.x series.
    @tpwrules
    tpwrules authored Dec 17, 2020

    Verified

    This commit was signed with the committer’s verified signature.
    shlevy Shea Levy
    GPG key ID: 5C0BD6957D86FE27
    Verified
    Learn about vigilant mode
    Copy the full SHA
    c322b7c View commit details
Showing with 0 additions and 4 deletions.
  1. +0 −4 pkgs/development/libraries/opencv/4.x.nix
4 changes: 0 additions & 4 deletions pkgs/development/libraries/opencv/4.x.nix
View file
Original file line number Diff line number Diff line change
@@ -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 =