diff --git a/pkgs/development/python-modules/qscintilla/default.nix b/pkgs/development/python-modules/qscintilla/default.nix new file mode 100644 index 00000000000..c4ea8ff2e73 --- /dev/null +++ b/pkgs/development/python-modules/qscintilla/default.nix @@ -0,0 +1,41 @@ +{ stdenv +, buildPythonPackage +, disabledIf +, isPy3k +, isPyPy +, pkgs +, python +, pyqt4 +}: + +disabledIf (isPy3k || isPyPy) + (buildPythonPackage rec { + # TODO: Qt5 support + name = "qscintilla-${version}"; + version = pkgs.qscintilla.version; + format = "other"; + + src = pkgs.qscintilla.src; + + buildInputs = [ pkgs.xorg.lndir pyqt4.qt pyqt4 ]; + + preConfigure = '' + mkdir -p $out + lndir ${pyqt4} $out + rm -rf "$out/nix-support" + 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 = with maintainers; [ danbst ]; + platforms = platforms.unix; + }; + }) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index be4f6f5b56a..0985a5c406b 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3556,38 +3556,7 @@ in { # alias for an older package which did not support Python 3 Quandl = callPackage ../development/python-modules/quandl { }; - qscintilla = disabledIf (isPy3k || isPyPy) - (buildPythonPackage rec { - # TODO: Qt5 support - name = "qscintilla-${version}"; - version = pkgs.qscintilla.version; - format = "other"; - - src = pkgs.qscintilla.src; - - buildInputs = with self; [ pkgs.xorg.lndir pyqt4.qt pyqt4 ]; - - preConfigure = '' - mkdir -p $out - lndir ${self.pyqt4} $out - rm -rf "$out/nix-support" - 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 = with maintainers; [ danbst ]; - platforms = platforms.unix; - }; - }); - + qscintilla = callPackage ../development/python-modules/qscintilla { }; qserve = buildPythonPackage rec { name = "qserve-0.2.8";