diff options
| author | Rok Garbas <rok@garbas.si> | 2015-08-29 21:22:29 +0200 |
|---|---|---|
| committer | Rok Garbas <rok@garbas.si> | 2015-08-29 21:22:29 +0200 |
| commit | 32dca6d3b2c2cbf7789852d5f557f6b753a83d85 (patch) | |
| tree | 42aed9effbbe565b2d7ef0d18e2e892ec3cf6370 /pkgs/development/python-modules/GitPython/hardcode-git-path.patch | |
| parent | 33cb16104c3157ce3f61e95c002a2b73cb8e0ac3 (diff) | |
pythonPackages.qscintilla: dont build on py3 and pypy
because qscintilla is not a standard python package ``buildPythonPackage`` is
not used and ``disabled`` does do anything.
diff --git a/pkgs/top-level/python-packages.nix
b/pkgs/top-level/python-packages.nix index 93d40c3..925ceb0 100644 ---
a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix
@@ -11823,35 +11823,36 @@ 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
- '';
+ qscintilla = if isPy3k || isPyPy
+ then throw "qscintilla-${pkgs.qscintilla.version} not supported for interpreter ${python.executable}"
+ else pkgs.stdenv.mkDerivation rec {
+ # TODO: Qt5 support
+ name = "qscintilla-${version}";
+ version = pkgs.qscintilla.version;
+
+ 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;
+ 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 {
Diffstat (limited to 'pkgs/development/python-modules/GitPython/hardcode-git-path.patch')
0 files changed, 0 insertions, 0 deletions
