From 07e956171d1c92c9e04845396ece298c2f4be4a6 Mon Sep 17 00:00:00 2001 From: Ioannis Koutras Date: Sat, 8 Dec 2018 15:56:19 +0200 Subject: [PATCH] shiboken: add support for Python 3.7 --- pkgs/development/python-modules/pyside/shiboken.nix | 4 ++-- 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 43ae52338af7..859e91c872ec 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, isPy36 }: +{ lib, fetchurl, cmake, buildPythonPackage, libxml2, libxslt, pysideApiextractor, pysideGeneratorrunner, python, sphinx, qt4, isPy3k, isPy35, isPy36, isPy37 }: # 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 @@ -25,7 +25,7 @@ buildPythonPackage rec { ''; # gcc6 patch was also sent upstream: https://github.com/pyside/Shiboken/pull/86 - patches = [ ./gcc6.patch ] ++ (lib.optional (isPy35 || isPy36) ./shiboken_py35.patch); + patches = [ ./gcc6.patch ] ++ (lib.optional (isPy35 || isPy36 || isPy37) ./shiboken_py35.patch); 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 32088144ed78..fb095cf991cf 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.6 3.5 3.4 3.3 3.2 3.1 3.0) ++FOREACH(_CURRENT_VERSION 3.7 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()