diff options
| author | Langston Barrett <langston.barrett@gmail.com> | 2017-07-25 21:35:53 +0000 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2017-07-28 16:13:28 +0200 |
| commit | 8081ab6e5cb8a190dbe68803ee40157db5de8907 (patch) | |
| tree | e89ca043a0c41d44865c5aef02045a91fb0bb416 /pkgs/development/python-modules/pyside | |
| parent | 0dea2d20a74aa0a56f0d7044b43b66b423331177 (diff) | |
| download | nixlib-8081ab6e5cb8a190dbe68803ee40157db5de8907.tar nixlib-8081ab6e5cb8a190dbe68803ee40157db5de8907.tar.gz nixlib-8081ab6e5cb8a190dbe68803ee40157db5de8907.tar.bz2 nixlib-8081ab6e5cb8a190dbe68803ee40157db5de8907.tar.lz nixlib-8081ab6e5cb8a190dbe68803ee40157db5de8907.tar.xz nixlib-8081ab6e5cb8a190dbe68803ee40157db5de8907.tar.zst nixlib-8081ab6e5cb8a190dbe68803ee40157db5de8907.zip | |
pythonPackages.pysideShiboken: patch for Python 3.6
Diffstat (limited to 'pkgs/development/python-modules/pyside')
| -rw-r--r-- | pkgs/development/python-modules/pyside/shiboken.nix | 4 | ||||
| -rw-r--r-- | pkgs/development/python-modules/pyside/shiboken_py35.patch | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/development/python-modules/pyside/shiboken.nix b/pkgs/development/python-modules/pyside/shiboken.nix index cef78c215500..0864b641cdba 100644 --- a/pkgs/development/python-modules/pyside/shiboken.nix +++ b/pkgs/development/python-modules/pyside/shiboken.nix @@ -1,4 +1,4 @@ -{ lib, fetchurl, cmake, buildPythonPackage, libxml2, libxslt, pysideApiextractor, pysideGeneratorrunner, python, sphinx, qt4, isPy3k, isPy35 }: +{ lib, fetchurl, cmake, buildPythonPackage, libxml2, libxslt, pysideApiextractor, pysideGeneratorrunner, python, sphinx, qt4, isPy3k, isPy35, isPy36 }: # This derivation provides a Python module and should therefore be called via `python-packages.nix`. # Python 3.5 is not supported: https://github.com/PySide/Shiboken/issues/77 @@ -23,7 +23,7 @@ buildPythonPackage rec { substituteInPlace generator/CMakeLists.txt --replace \ \"$\{GENERATORRUNNER_PLUGIN_DIR}\" lib/generatorrunner/ ''; - patches = if isPy35 then [ ./shiboken_py35.patch ] else null; + patches = if (isPy35 || isPy36) then [ ./shiboken_py35.patch ] else null; cmakeFlags = if isPy3k then "-DUSE_PYTHON3=TRUE" else null; diff --git a/pkgs/development/python-modules/pyside/shiboken_py35.patch b/pkgs/development/python-modules/pyside/shiboken_py35.patch index 5642ddc594d1..32088144ed78 100644 --- a/pkgs/development/python-modules/pyside/shiboken_py35.patch +++ b/pkgs/development/python-modules/pyside/shiboken_py35.patch @@ -6,7 +6,7 @@ diff --git a/cmake/Modules/FindPython3Libs.cmake b/cmake/Modules/FindPython3Libs # CMAKE_FIND_FRAMEWORKS(Python) -FOREACH(_CURRENT_VERSION 3.4 3.3 3.2 3.1 3.0) -+FOREACH(_CURRENT_VERSION 3.5 3.4 3.3 3.2 3.1 3.0) ++FOREACH(_CURRENT_VERSION 3.6 3.5 3.4 3.3 3.2 3.1 3.0) IF(_CURRENT_VERSION GREATER 3.1) SET(_32FLAGS "m" "u" "mu" "dm" "du" "dmu" "") ELSE() |