diff options
author | Frederik Rietdijk <fridh@fridh.nl> | 2015-12-09 11:05:26 +0100 |
---|---|---|
committer | Frederik Rietdijk <fridh@fridh.nl> | 2015-12-11 11:28:32 +0100 |
commit | 515a13b1f50fad34482457c616e6c5d090c2da3c (patch) | |
tree | bb17cac5a22cd13112d85a6ac41b92123bc39303 /pkgs/development/python-modules/pyside | |
parent | 2ed93d74d5218607e607b3e63a1f9ed9f34715ec (diff) | |
download | nixlib-515a13b1f50fad34482457c616e6c5d090c2da3c.tar nixlib-515a13b1f50fad34482457c616e6c5d090c2da3c.tar.gz nixlib-515a13b1f50fad34482457c616e6c5d090c2da3c.tar.bz2 nixlib-515a13b1f50fad34482457c616e6c5d090c2da3c.tar.lz nixlib-515a13b1f50fad34482457c616e6c5d090c2da3c.tar.xz nixlib-515a13b1f50fad34482457c616e6c5d090c2da3c.tar.zst nixlib-515a13b1f50fad34482457c616e6c5d090c2da3c.zip |
python pyside: move callPackage to python-packages.nix
This should make pyside available for all Python versions.
Diffstat (limited to 'pkgs/development/python-modules/pyside')
5 files changed, 16 insertions, 13 deletions
diff --git a/pkgs/development/python-modules/pyside/apiextractor.nix b/pkgs/development/python-modules/pyside/apiextractor.nix index e3bcf059c1c2..c7e0cc09f14b 100644 --- a/pkgs/development/python-modules/pyside/apiextractor.nix +++ b/pkgs/development/python-modules/pyside/apiextractor.nix @@ -1,7 +1,7 @@ -{ stdenv, fetchurl, cmake, libxml2, libxslt, python27Packages, qt4 }: +{ stdenv, fetchurl, cmake, libxml2, libxslt, python, sphinx, qt4 }: stdenv.mkDerivation { - name = "pyside-apiextractor-0.10.10"; + name = "${python.libPrefix}-pyside-apiextractor-0.10.10"; src = fetchurl { url = "https://github.com/PySide/Apiextractor/archive/0.10.10.tar.gz"; @@ -10,7 +10,7 @@ stdenv.mkDerivation { enableParallelBuilding = true; - buildInputs = [ cmake libxml2 libxslt python27Packages.sphinx qt4 ]; + buildInputs = [ cmake libxml2 libxslt sphinx qt4 ]; meta = { description = "Eases the development of bindings of Qt-based libraries for high level languages by automating most of the process"; diff --git a/pkgs/development/python-modules/pyside/default.nix b/pkgs/development/python-modules/pyside/default.nix index f81a2fda56c7..fc009a208b70 100644 --- a/pkgs/development/python-modules/pyside/default.nix +++ b/pkgs/development/python-modules/pyside/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, pysideGeneratorrunner, pysideShiboken, qt4 }: +{ stdenv, fetchurl, cmake, python, pysideGeneratorrunner, pysideShiboken, qt4 }: stdenv.mkDerivation rec { name = "${python.libPrefix}-pyside-${version}"; diff --git a/pkgs/development/python-modules/pyside/generatorrunner.nix b/pkgs/development/python-modules/pyside/generatorrunner.nix index 2423cbb0c2e4..b576b29dae7b 100644 --- a/pkgs/development/python-modules/pyside/generatorrunner.nix +++ b/pkgs/development/python-modules/pyside/generatorrunner.nix @@ -1,7 +1,7 @@ -{ stdenv, fetchurl, cmake, pysideApiextractor, python27Packages, qt4 }: +{ stdenv, fetchurl, cmake, pysideApiextractor, python, sphinx, qt4 }: stdenv.mkDerivation { - name = "pyside-generatorrunner-0.6.16"; + name = "${python.libPrefix}-pyside-generatorrunner-0.6.16"; src = fetchurl { url = "https://github.com/PySide/Generatorrunner/archive/0.6.16.tar.gz"; @@ -10,7 +10,7 @@ stdenv.mkDerivation { enableParallelBuilding = true; - buildInputs = [ cmake pysideApiextractor python27Packages.sphinx qt4 ]; + buildInputs = [ cmake pysideApiextractor sphinx qt4 ]; meta = { description = "Eases the development of binding generators for C++ and Qt-based libraries by providing a framework to help automating most of the process"; diff --git a/pkgs/development/python-modules/pyside/shiboken.nix b/pkgs/development/python-modules/pyside/shiboken.nix index c2550a852f7f..549b6275a8ce 100644 --- a/pkgs/development/python-modules/pyside/shiboken.nix +++ b/pkgs/development/python-modules/pyside/shiboken.nix @@ -1,6 +1,7 @@ -{ stdenv, fetchurl, cmake, pysideApiextractor, pysideGeneratorrunner, python27, python27Packages, qt4 }: +{ stdenv, fetchurl, cmake, libxml2, libxslt, pysideApiextractor, pysideGeneratorrunner, python, sphinx, qt4, isPy3k, isPy35 }: -stdenv.mkDerivation rec { +# Python 3.5 is not supported: https://github.com/PySide/Shiboken/issues/77 +if isPy35 then throw "shiboken not supported for interpreter ${python.executable}" else stdenv.mkDerivation rec { name = "${python.libPrefix}-pyside-shiboken-${version}"; version = "1.2.4"; @@ -11,7 +12,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - buildInputs = [ cmake pysideApiextractor pysideGeneratorrunner python27 python27Packages.sphinx qt4 ]; + buildInputs = [ cmake libxml2 libxslt pysideApiextractor pysideGeneratorrunner python sphinx qt4 ]; preConfigure = '' echo "preConfigure: Fixing shiboken_generator install target." @@ -19,6 +20,8 @@ stdenv.mkDerivation rec { \"$\{GENERATORRUNNER_PLUGIN_DIR}\" lib/generatorrunner/ ''; + cmakeFlags = if isPy3k then "-DUSE_PYTHON3=TRUE" else null; + meta = { description = "Plugin (front-end) for pyside-generatorrunner, that generates bindings for C++ libraries using CPython source code"; license = stdenv.lib.licenses.gpl2; diff --git a/pkgs/development/python-modules/pyside/tools.nix b/pkgs/development/python-modules/pyside/tools.nix index b5ddec09c03e..facbccdce355 100644 --- a/pkgs/development/python-modules/pyside/tools.nix +++ b/pkgs/development/python-modules/pyside/tools.nix @@ -1,7 +1,7 @@ -{ stdenv, fetchurl, cmake, pyside, python27, qt4, pysideShiboken }: +{ stdenv, fetchurl, cmake, pyside, python, qt4, pysideShiboken }: stdenv.mkDerivation { - name = "pyside-tools-0.2.15"; + name = "${python.libPrefix}-pyside-tools-0.2.15"; src = fetchurl { url = "https://github.com/PySide/Tools/archive/0.2.15.tar.gz"; @@ -10,7 +10,7 @@ stdenv.mkDerivation { enableParallelBuilding = true; - buildInputs = [ cmake pyside python27 qt4 pysideShiboken ]; + buildInputs = [ cmake pyside python qt4 pysideShiboken ]; meta = { description = "Tools for pyside, the LGPL-licensed Python bindings for the Qt cross-platform application and UI framework"; |