Unverified Commit 197f37c8 authored by Lewis Arias's avatar Lewis Arias
Browse files

opencv4: properly install Python type-stubs

Without these type stubs installed auto-completion for the `cv2` module
will not be available and diagnostics may not be accurate.
This is especially notable in a devshell using `mkShell` and `python3.withPackages`
leading to editors such as Neovim having a poor development experience.
parent d0deb158
Loading
Loading
Loading
Loading
+1 −5
Original line number Diff line number Diff line
@@ -480,7 +480,7 @@ effectiveStdenv.mkDerivation {
  ] ++ optionals (!effectiveStdenv.hostPlatform.isDarwin) [
    (cmakeOptionType "path" "OPENCL_LIBRARY" "${ocl-icd}/lib/libOpenCL.so")
  ] ++ optionals enablePython [
    (cmakeBool "OPENCV_SKIP_PYTHON_LOADER" true)
    (cmakeOptionType "path" "OPENCV_PYTHON_INSTALL_PATH" pythonPackages.python.sitePackages)
  ] ++ optionals (enabledModules != [ ]) [
    (cmakeFeature "BUILD_LIST" (concatStringsSep "," enabledModules))
  ];
@@ -541,10 +541,6 @@ effectiveStdenv.mkDerivation {
    pushd dist
    python -m pip install ./*.whl --no-index --no-warn-script-location --prefix="$out" --no-cache

    # the cv2/__init__.py just tries to check provide "nice user feedback" if the installation is bad
    # however, this also causes infinite recursion when used by other packages
    rm -r $out/${pythonPackages.python.sitePackages}/cv2

    popd
    popd
  '';