lol

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

Fixes PyQt5 build.

authored by

K900 and committed by
Martin Weinelt
52ad8519 353e6ff6

+26
+6
pkgs/development/python-modules/pyqt-builder/default.nix
··· 10 10 sha256 = "sha256-SHdYDDjOtTIOEps4HQg7CoYBxoFm2LmXB/CPoKFonu8="; 11 11 }; 12 12 13 + patches = [ 14 + # use the sip-distinfo executable from PATH instead of trying to guess, 15 + # we know it's the right one because it's the _only_ one 16 + ./use-sip-distinfo-from-path.patch 17 + ]; 18 + 13 19 propagatedBuildInputs = [ packaging sip ]; 14 20 15 21 pythonImportsCheck = [ "pyqtbuild" ];
+20
pkgs/development/python-modules/pyqt-builder/use-sip-distinfo-from-path.patch
··· 1 + diff --git a/pyqtbuild/builder.py b/pyqtbuild/builder.py 2 + index 3f35a7f..58701dd 100644 3 + --- a/pyqtbuild/builder.py 4 + +++ b/pyqtbuild/builder.py 5 + @@ -51,15 +51,6 @@ class QmakeBuilder(Builder): 6 + """ Set default values for user options that haven't been set yet. """ 7 + 8 + if tool in Option.BUILD_TOOLS: 9 + - # A PEP 517 frontend will set PATH so that sip-distinfo is found on 10 + - # it. However for our own frontends we want to use the version 11 + - # corresponding to the frontend (and, anyway, the frontend may not 12 + - # be on PATH). 13 + - if tool != 'pep517': 14 + - self._sip_distinfo = os.path.join( 15 + - os.path.abspath(os.path.dirname(sys.argv[0])), 16 + - self._sip_distinfo) 17 + - 18 + # Check we have a qmake. 19 + if self.qmake is None: 20 + self.qmake = self._find_exe('qmake')