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

python.pkgs.pysideShiboken: fix gcc6 build

Browse Source
This commit is contained in:
Jörg Thalheim
2017-08-26 09:14:51 +01:00
parent a580bedcf1
commit 48f337a882
2 changed files with 22 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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;