pythonPackages.pysideShiboken: fix build with python 3.9
This commit is contained in:
parent
bcc99b83d0
commit
2e03ce9440
|
@ -1,8 +1,6 @@
|
||||||
{ lib, fetchFromGitHub, buildPythonPackage
|
{ lib, fetchFromGitHub, buildPythonPackage
|
||||||
, cmake
|
, cmake
|
||||||
, isPy35
|
, fetchurl
|
||||||
, isPy36
|
|
||||||
, isPy37
|
|
||||||
, isPy3k
|
, isPy3k
|
||||||
, libxml2
|
, libxml2
|
||||||
, libxslt
|
, libxslt
|
||||||
|
@ -10,6 +8,7 @@
|
||||||
, pysideApiextractor
|
, pysideApiextractor
|
||||||
, pysideGeneratorrunner
|
, pysideGeneratorrunner
|
||||||
, python
|
, python
|
||||||
|
, pythonAtLeast
|
||||||
, qt4
|
, qt4
|
||||||
, sphinx
|
, sphinx
|
||||||
}:
|
}:
|
||||||
|
@ -39,8 +38,17 @@ buildPythonPackage rec {
|
||||||
\"$\{GENERATORRUNNER_PLUGIN_DIR}\" lib/generatorrunner/
|
\"$\{GENERATORRUNNER_PLUGIN_DIR}\" lib/generatorrunner/
|
||||||
'';
|
'';
|
||||||
|
|
||||||
# gcc6 patch was also sent upstream: https://github.com/pyside/Shiboken/pull/86
|
patches = [
|
||||||
patches = [ ./gcc6.patch ] ++ (lib.optional (isPy35 || isPy36 || isPy37) ./shiboken_py35.patch);
|
# gcc6 patch was also sent upstream: https://github.com/pyside/Shiboken/pull/86
|
||||||
|
./gcc6.patch
|
||||||
|
(lib.optional (pythonAtLeast "3.5") ./shiboken_py35.patch)
|
||||||
|
(fetchurl {
|
||||||
|
# https://github.com/pyside/Shiboken/pull/90
|
||||||
|
name = "fix-build-with-python-3.9.patch";
|
||||||
|
url = "https://github.com/pyside/Shiboken/commit/d1c901d4c0af581003553865360ba964cda041e8.patch";
|
||||||
|
sha256 = "1f7slz8n8rps5r67hz3hi4rr82igc3l166shfy6647ivsb2fnxwy";
|
||||||
|
})
|
||||||
|
];
|
||||||
|
|
||||||
cmakeFlags = lib.optionals isPy3k [
|
cmakeFlags = lib.optionals isPy3k [
|
||||||
"-DUSE_PYTHON3=TRUE"
|
"-DUSE_PYTHON3=TRUE"
|
||||||
|
|
Loading…
Reference in New Issue