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

python3Packages.pyside2: 5.12.3 -> 5.12.6

Browse Source 
fixes #91726
This commit is contained in:
ash lea 2020-07-08 15:29:35 -07:00
parent 141f9ce807
commit 888d7bb4db
2 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/python-modules/pyside2/default.nix
View File

@ -3,11 +3,11 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "pyside2"; pname = "pyside2";
version = "5.12.3"; version = "5.12.6";
src = fetchurl { src = fetchurl {
url = "https://download.qt.io/official_releases/QtForPython/pyside2/PySide2-${version}-src/pyside-setup-everywhere-src-${version}.tar.xz"; url = "https://download.qt.io/official_releases/QtForPython/pyside2/PySide2-${version}-src/pyside-setup-everywhere-src-${version}.tar.xz";
sha256 = "0hk89jm8pa0q6kifask5rrffa3bvx02dg2f97ibv7wds9dysnyjg"; sha256 = "1n45l6xxyxs6cfp2l4rp8qs1c2fyfwyrdxa4qcpwfsqsi51rydsk";
}; };
patches = [ patches = [

13
pkgs/development/python-modules/shiboken2/nix_compile_cflags.patch
View File

@ -1,6 +1,6 @@
--- pyside-setup-everywhere-src-5.12.3/sources/shiboken2/ApiExtractor/clangparser/compilersupport.cpp~ 2019-06-15 10:31:04.712949189 +0200 --- pyside-setup-everywhere-src-5.12.6/sources/shiboken2/ApiExtractor/clangparser/compilersupport.cpp~ 2020-07-08 14:37:13.022476435 -0700
+++ pyside-setup-everywhere-src-5.12.3/sources/shiboken2/ApiExtractor/clangparser/compilersupport.cpp 2019-06-15 11:52:52.894987343 +0200 +++ pyside-setup-everywhere-src-5.12.6/sources/shiboken2/ApiExtractor/clangparser/compilersupport.cpp 2020-07-08 14:37:18.271484269 -0700
@@ -317,15 +317,15 @@ @@ -330,17 +330,15 @@
} }
#endif // NEED_CLANG_BUILTIN_INCLUDES #endif // NEED_CLANG_BUILTIN_INCLUDES
@ -9,10 +9,12 @@
- // A fix for this has been added to Clang 5.0, so, the code can be removed - // A fix for this has been added to Clang 5.0, so, the code can be removed
- // once Clang 5.0 is the minimum version. - // once Clang 5.0 is the minimum version.
- if (needsGppInternalHeaders()) { - if (needsGppInternalHeaders()) {
- const HeaderPaths gppPaths = gppInternalIncludePaths(QStringLiteral("g++")); - const HeaderPaths gppPaths = gppInternalIncludePaths(compilerFromCMake(QStringLiteral("g++")));
- for (const HeaderPath &h : gppPaths) { - for (const HeaderPath &h : gppPaths) {
- if (h.path.contains("c++")) - if (h.path.contains("c++")
- || h.path.contains("sysroot")) { // centOS
- headerPaths.append(h); - headerPaths.append(h);
- }
+ const HeaderPaths gppPaths = gppInternalIncludePaths(QStringLiteral("g++")); + const HeaderPaths gppPaths = gppInternalIncludePaths(QStringLiteral("g++"));
+ for (const HeaderPath &h : gppPaths) { + for (const HeaderPath &h : gppPaths) {
+ // PySide2 requires that Qt headers are not -isystem + // PySide2 requires that Qt headers are not -isystem
@ -25,3 +27,4 @@
} }
} }
#else #else