pyrox.dev
fork
Configure Feed
Select the types of activity you want to include in your feed.
lol
fork
Configure Feed
Select the types of activity you want to include in your feed.
pythonPackages.pysideShiboken: patch for Python 3.6
authored by
Langston Barrett
and committed by
Frederik Rietdijk
8081ab6e
0dea2d20
+3
-3
+2
-2
pkgs/development/python-modules/pyside/shiboken.nix
+2
-2
pkgs/development/python-modules/pyside/shiboken.nix
···
1
-
{ lib, fetchurl, cmake, buildPythonPackage, libxml2, libxslt, pysideApiextractor, pysideGeneratorrunner, python, sphinx, qt4, isPy3k, isPy35 }:
1
+
{ lib, fetchurl, cmake, buildPythonPackage, libxml2, libxslt, pysideApiextractor, pysideGeneratorrunner, python, sphinx, qt4, isPy3k, isPy35, isPy36 }:
2
2
3
3
# This derivation provides a Python module and should therefore be called via `python-packages.nix`.
4
4
# Python 3.5 is not supported: https://github.com/PySide/Shiboken/issues/77
···
23
23
substituteInPlace generator/CMakeLists.txt --replace \
24
24
\"$\{GENERATORRUNNER_PLUGIN_DIR}\" lib/generatorrunner/
25
25
'';
26
-
patches = if isPy35 then [ ./shiboken_py35.patch ] else null;
26
+
patches = if (isPy35 || isPy36) then [ ./shiboken_py35.patch ] else null;
27
27
28
28
cmakeFlags = if isPy3k then "-DUSE_PYTHON3=TRUE" else null;
29
29
+1
-1
pkgs/development/python-modules/pyside/shiboken_py35.patch
+1
-1
pkgs/development/python-modules/pyside/shiboken_py35.patch
···
6
6
# CMAKE_FIND_FRAMEWORKS(Python)
7
7
8
8
-FOREACH(_CURRENT_VERSION 3.4 3.3 3.2 3.1 3.0)
9
-
+FOREACH(_CURRENT_VERSION 3.5 3.4 3.3 3.2 3.1 3.0)
9
+
+FOREACH(_CURRENT_VERSION 3.6 3.5 3.4 3.3 3.2 3.1 3.0)
10
10
IF(_CURRENT_VERSION GREATER 3.1)
11
11
SET(_32FLAGS "m" "u" "mu" "dm" "du" "dmu" "")
12
12
ELSE()