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

pythonPackages.qscintilla-qt5: fix installation

This commit is contained in:
Lancelot SIX 2019-02-27 22:07:30 +01:00
parent def5aeb17f
commit b47f47ab10
No known key found for this signature in database
GPG Key ID: 02E1542BA66FB047
2 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,19 +1,18 @@
{ lib { lib
, buildPythonPackage , pythonPackages
, qscintillaCpp , qscintilla
, lndir , lndir
, sip , qtbase
, python }:
, pyqt5 }: with pythonPackages;
buildPythonPackage rec { buildPythonPackage rec {
pname = "qscintilla"; pname = "qscintilla";
version = qscintillaCpp.version; version = qscintilla.version;
src = qscintillaCpp.src; src = qscintilla.src;
format = "other"; format = "other";
nativeBuildInputs = [ lndir sip ]; nativeBuildInputs = [ lndir sip qtbase ];
buildInputs = [ qscintillaCpp ]; buildInputs = [ qscintilla ];
propagatedBuildInputs = [ pyqt5 ]; propagatedBuildInputs = [ pyqt5 ];
preConfigure = '' preConfigure = ''
@ -23,13 +22,14 @@ buildPythonPackage rec {
cd Python cd Python
${python.executable} ./configure.py \ ${python.executable} ./configure.py \
--pyqt=PyQt5 \ --pyqt=PyQt5 \
--destdir=$out/lib/${python.sitePackages}/PyQt5 \ --destdir=$out/${python.sitePackages}/PyQt5 \
--stubsdir=$out/lib/${python.sitePackages}/PyQt5 \ --stubsdir=$out/${python.sitePackages}/PyQt5 \
--apidir=$out/api/${python.libPrefix} \ --apidir=$out/api/${python.libPrefix} \
--qsci-incdir=${qscintillaCpp}/include \ --qsci-incdir=${qscintilla}/include \
--qsci-libdir=${qscintillaCpp}/lib \ --qsci-libdir=${qscintilla}/lib \
--pyqt-sipdir=${pyqt5}/share/sip/PyQt5 \ --pyqt-sipdir=${pyqt5}/share/sip/PyQt5 \
--qsci-sipdir=$out/share/sip/PyQt5 --qsci-sipdir=$out/share/sip/PyQt5 \
--sip-incdir=${sip}/include
''; '';
meta = with lib; { meta = with lib; {

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

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