diff options
| -rw-r--r-- | pkgs/development/libraries/qscintilla/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/top-level/python-packages.nix | 31 |
2 files changed, 31 insertions, 2 deletions
diff --git a/pkgs/development/libraries/qscintilla/default.nix b/pkgs/development/libraries/qscintilla/default.nix index 8c7301e3c40..26d412e5a8c 100644 --- a/pkgs/development/libraries/qscintilla/default.nix +++ b/pkgs/development/libraries/qscintilla/default.nix @@ -23,8 +23,6 @@ stdenv.mkDerivation rec { qmake qscintilla.pro ''; - # TODO PyQt Support. - meta = { description = "A Qt port of the Scintilla text editing library"; longDescription = '' diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 6c4d625a414..e71eb336655 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -11397,6 +11397,37 @@ let }; }; + qscintilla = pkgs.stdenv.mkDerivation rec { + # TODO: Qt5 support + name = "qscintilla-${version}"; + version = pkgs.qscintilla.version; + disabled = isPy3k || isPyPy; + + src = pkgs.qscintilla.src; + + buildInputs = with pkgs; [ xorg.lndir qt4 pyqt4 python ]; + + preConfigure = '' + mkdir -p $out + lndir ${pkgs.pyqt4} $out + cd Python + ${python.executable} ./configure-old.py \ + --destdir $out/lib/${python.libPrefix}/site-packages/PyQt4 \ + --apidir $out/api/${python.libPrefix} \ + -n ${pkgs.qscintilla}/include \ + -o ${pkgs.qscintilla}/lib \ + --sipdir $out/share/sip + ''; + + meta = with stdenv.lib; { + description = "A Python binding to QScintilla, Qt based text editing control"; + license = licenses.lgpl21Plus; + maintainers = [ "abcz2.uprola@gmail.com" ]; + platforms = platforms.linux; + }; + }; + + qserve = buildPythonPackage rec { name = "qserve-0.2.8"; disabled = isPy3k; |