JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #16252 from luispedro/shiboken_on_py35

Browse Source 
shiboken: add support for Python 3.5
This commit is contained in:
Frederik Rietdijk 2016-06-16 10:49:00 +02:00 committed by GitHub
commit fde378480c
2 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkgs/development/python-modules/pyside/shiboken.nix
View File

@ -1,7 +1,7 @@
{ stdenv, fetchurl, cmake, libxml2, libxslt, pysideApiextractor, pysideGeneratorrunner, python, sphinx, qt4, isPy3k, isPy35 }: { stdenv, fetchurl, cmake, libxml2, libxslt, pysideApiextractor, pysideGeneratorrunner, python, sphinx, qt4, isPy3k, isPy35 }:
# Python 3.5 is not supported: https://github.com/PySide/Shiboken/issues/77 # 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 { stdenv.mkDerivation rec {
name = "${python.libPrefix}-pyside-shiboken-${version}"; name = "${python.libPrefix}-pyside-shiboken-${version}";
version = "1.2.4"; version = "1.2.4";
@ -19,6 +19,7 @@ if isPy35 then throw "shiboken not supported for interpreter ${python.executable
substituteInPlace generator/CMakeLists.txt --replace \ substituteInPlace generator/CMakeLists.txt --replace \
\"$\{GENERATORRUNNER_PLUGIN_DIR}\" lib/generatorrunner/ \"$\{GENERATORRUNNER_PLUGIN_DIR}\" lib/generatorrunner/
''; '';
patches = if isPy35 then [ ./shiboken_py35.patch ] else null;
cmakeFlags = if isPy3k then "-DUSE_PYTHON3=TRUE" else null; cmakeFlags = if isPy3k then "-DUSE_PYTHON3=TRUE" else null;

12
pkgs/development/python-modules/pyside/shiboken_py35.patch Normal file
View File

@ -0,0 +1,12 @@
diff --git a/cmake/Modules/FindPython3Libs.cmake b/cmake/Modules/FindPython3Libs.cmake
--- a/cmake/Modules/FindPython3Libs.cmake
+++ b/cmake/Modules/FindPython3Libs.cmake
@@ -27,7 +27,7 @@ INCLUDE(CMakeFindFrameworks)
# Search for the python framework on Apple.
# 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)
IF(_CURRENT_VERSION GREATER 3.1)
SET(_32FLAGS "m" "u" "mu" "dm" "du" "dmu" "")
ELSE()