pythonPackages.qscintilla-qt5: Do not copy pyqt5 tree
This commit ensures the entire PyQt5 tree is not included inside qscintilla as pointed out by https://github.com/NixOS/nixpkgs/issues/73975#issuecomment-639178216
This commit is contained in:
parent
554e90cae7
commit
b10b50d433
|
@ -1,7 +1,6 @@
|
|||
{ lib
|
||||
, pythonPackages
|
||||
, qscintilla
|
||||
, lndir
|
||||
, qtbase
|
||||
}:
|
||||
with pythonPackages;
|
||||
|
@ -11,8 +10,9 @@ buildPythonPackage {
|
|||
src = qscintilla.src;
|
||||
format = "other";
|
||||
|
||||
nativeBuildInputs = [ lndir sip qtbase ];
|
||||
buildInputs = [ qscintilla pyqt5 ];
|
||||
nativeBuildInputs = [ sip qtbase ];
|
||||
buildInputs = [ qscintilla ];
|
||||
propagatedBuildInputs = [ pyqt5 ];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace Python/configure.py \
|
||||
|
@ -22,9 +22,9 @@ buildPythonPackage {
|
|||
'';
|
||||
|
||||
preConfigure = ''
|
||||
mkdir -p $out
|
||||
lndir ${pyqt5} $out
|
||||
rm -rf "$out/nix-support"
|
||||
# configure.py will look for this folder
|
||||
mkdir -p $out/share/sip/PyQt5
|
||||
|
||||
cd Python
|
||||
substituteInPlace configure.py \
|
||||
--replace "qmake = {'CONFIG': 'qscintilla2'}" "qmake = {'CONFIG': 'qscintilla2', 'QT': 'widgets printsupport'}"
|
||||
|
|
|
@ -5637,7 +5637,6 @@ in {
|
|||
|
||||
qscintilla-qt5 = pkgs.libsForQt5.callPackage ../development/python-modules/qscintilla-qt5 {
|
||||
pythonPackages = self;
|
||||
lndir = pkgs.xorg.lndir;
|
||||
};
|
||||
|
||||
qscintilla = self.qscintilla-qt4;
|
||||
|
|
Loading…
Reference in a new issue