public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

pythonPackages.qscintilla-qt5: Do not copy pyqt5 tree

Browse Source 
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:
Lancelot SIX 2020-06-22 11:21:19 +01:00
parent 554e90cae7
commit b10b50d433
No known key found for this signature in database
GPG Key ID: 02E1542BA66FB047
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkgs/development/python-modules/qscintilla-qt5/default.nix
View File

@ -1,7 +1,6 @@
{ lib { lib
, pythonPackages , pythonPackages
, qscintilla , qscintilla
, lndir
, qtbase , qtbase
}: }:
with pythonPackages; with pythonPackages;
@ -11,8 +10,9 @@ buildPythonPackage {
src = qscintilla.src; src = qscintilla.src;
format = "other"; format = "other";
nativeBuildInputs = [ lndir sip qtbase ]; nativeBuildInputs = [ sip qtbase ];
buildInputs = [ qscintilla pyqt5 ]; buildInputs = [ qscintilla ];
propagatedBuildInputs = [ pyqt5 ];
postPatch = '' postPatch = ''
substituteInPlace Python/configure.py \ substituteInPlace Python/configure.py \
@ -22,9 +22,9 @@ buildPythonPackage {
''; '';
preConfigure = '' preConfigure = ''
mkdir -p $out # configure.py will look for this folder
lndir ${pyqt5} $out mkdir -p $out/share/sip/PyQt5
rm -rf "$out/nix-support"
cd Python cd Python
substituteInPlace configure.py \ substituteInPlace configure.py \
--replace "qmake = {'CONFIG': 'qscintilla2'}" "qmake = {'CONFIG': 'qscintilla2', 'QT': 'widgets printsupport'}" --replace "qmake = {'CONFIG': 'qscintilla2'}" "qmake = {'CONFIG': 'qscintilla2', 'QT': 'widgets printsupport'}"

1
pkgs/top-level/python-packages.nix
View File

@ -5637,7 +5637,6 @@ in {
qscintilla-qt5 = pkgs.libsForQt5.callPackage ../development/python-modules/qscintilla-qt5 { qscintilla-qt5 = pkgs.libsForQt5.callPackage ../development/python-modules/qscintilla-qt5 {
pythonPackages = self; pythonPackages = self;
lndir = pkgs.xorg.lndir;
}; };
qscintilla = self.qscintilla-qt4; qscintilla = self.qscintilla-qt4;