diff options
author | Jörg Thalheim <joerg@thalheim.io> | 2017-08-26 09:14:51 +0100 |
---|---|---|
committer | Jörg Thalheim <joerg@thalheim.io> | 2017-08-26 09:15:49 +0100 |
commit | 48f337a882a46bb5a9105ed592db05776ad1a507 (patch) | |
tree | 9d9de6491232fae01d6c8d6475a109dfe434adcd /pkgs/development/python-modules/pyside | |
parent | a580bedcf1c7dd064bc3e9374a6a52220f71d800 (diff) | |
download | nixlib-48f337a882a46bb5a9105ed592db05776ad1a507.tar nixlib-48f337a882a46bb5a9105ed592db05776ad1a507.tar.gz nixlib-48f337a882a46bb5a9105ed592db05776ad1a507.tar.bz2 nixlib-48f337a882a46bb5a9105ed592db05776ad1a507.tar.lz nixlib-48f337a882a46bb5a9105ed592db05776ad1a507.tar.xz nixlib-48f337a882a46bb5a9105ed592db05776ad1a507.tar.zst nixlib-48f337a882a46bb5a9105ed592db05776ad1a507.zip |
python.pkgs.pysideShiboken: fix gcc6 build
Diffstat (limited to 'pkgs/development/python-modules/pyside')
-rw-r--r-- | pkgs/development/python-modules/pyside/gcc6.patch | 18 | ||||
-rw-r--r-- | pkgs/development/python-modules/pyside/shiboken.nix | 5 |
2 files changed, 22 insertions, 1 deletions
diff --git a/pkgs/development/python-modules/pyside/gcc6.patch b/pkgs/development/python-modules/pyside/gcc6.patch new file mode 100644 index 000000000000..440e94508c57 --- /dev/null +++ b/pkgs/development/python-modules/pyside/gcc6.patch @@ -0,0 +1,18 @@ +--- Shiboken-1.2.4.org/tests/libsample/simplefile.cpp 2017-08-26 09:06:27.216859143 +0100 ++++ Shiboken-1.2.4/tests/libsample/simplefile.cpp 2017-08-26 09:05:40.037029652 +0100 +@@ -90,13 +90,13 @@ + SimpleFile::exists() const + { + std::ifstream ifile(p->m_filename); +- return ifile; ++ return (bool)ifile; + } + + bool + SimpleFile::exists(const char* filename) + { + std::ifstream ifile(filename); +- return ifile; ++ return (bool)ifile; + } + diff --git a/pkgs/development/python-modules/pyside/shiboken.nix b/pkgs/development/python-modules/pyside/shiboken.nix index 82a40c96f644..c588bac69ccf 100644 --- a/pkgs/development/python-modules/pyside/shiboken.nix +++ b/pkgs/development/python-modules/pyside/shiboken.nix @@ -14,6 +14,7 @@ buildPythonPackage rec { sha256 = "1536f73a3353296d97a25e24f9554edf3e6a48126886f8d21282c3645ecb96a4"; }; + enableParallelBuilding = true; buildInputs = [ cmake libxml2 libxslt pysideApiextractor pysideGeneratorrunner python sphinx qt4 ]; @@ -23,7 +24,9 @@ buildPythonPackage rec { substituteInPlace generator/CMakeLists.txt --replace \ \"$\{GENERATORRUNNER_PLUGIN_DIR}\" lib/generatorrunner/ ''; - patches = if (isPy35 || isPy36) then [ ./shiboken_py35.patch ] else null; + + # gcc6 patch was also sent upstream: https://github.com/pyside/Shiboken/pull/86 + patches = [ ./gcc6.patch ] ++ (lib.optional (isPy35 || isPy36) ./shiboken_py35.patch); cmakeFlags = if isPy3k then "-DUSE_PYTHON3=TRUE" else null; |