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

Merge pull request #91278 from lsix/improve-qscintilla-qt5

Browse Source 
pythonPackages.qscintilla-qt5: Do not copy pyqt5 tree
This commit is contained in:
Benjamin Hipple 2020-07-05 22:24:25 -04:00 committed by GitHub
commit 38b527043c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
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
, 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'}"

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

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