python3Packages.pyqt-builder: use sip-distinfo from PATH

Fixes PyQt5 build.
This commit is contained in:
K900 2022-07-21 20:20:48 +03:00 committed by Martin Weinelt
parent 353e6ff616
commit 52ad8519d5
2 changed files with 26 additions and 0 deletions

View File

@ -10,6 +10,12 @@ buildPythonPackage rec {
sha256 = "sha256-SHdYDDjOtTIOEps4HQg7CoYBxoFm2LmXB/CPoKFonu8=";
};
patches = [
# use the sip-distinfo executable from PATH instead of trying to guess,
# we know it's the right one because it's the _only_ one
./use-sip-distinfo-from-path.patch
];
propagatedBuildInputs = [ packaging sip ];
pythonImportsCheck = [ "pyqtbuild" ];

View File

@ -0,0 +1,20 @@
diff --git a/pyqtbuild/builder.py b/pyqtbuild/builder.py
index 3f35a7f..58701dd 100644
--- a/pyqtbuild/builder.py
+++ b/pyqtbuild/builder.py
@@ -51,15 +51,6 @@ class QmakeBuilder(Builder):
""" Set default values for user options that haven't been set yet. """
if tool in Option.BUILD_TOOLS:
- # A PEP 517 frontend will set PATH so that sip-distinfo is found on
- # it. However for our own frontends we want to use the version
- # corresponding to the frontend (and, anyway, the frontend may not
- # be on PATH).
- if tool != 'pep517':
- self._sip_distinfo = os.path.join(
- os.path.abspath(os.path.dirname(sys.argv[0])),
- self._sip_distinfo)
-
# Check we have a qmake.
if self.qmake is None:
self.qmake = self._find_exe('qmake')