git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #92773 from ashkitten/update-pyside2

python3Packages.pyside2: 5.12.3 -> 5.12.6

commitb5cd6a36d2ecab4fae1f21eed0f35e6ecb3b5ab8 authorGabriel Ebner <gebner@gebner.org> dateThu 9 Jul 2020, 11:09 (6 years ago) parent141f9ce888d7bb
2 files changed+10−7
pkgs/development/python-modules/pyside2/default.nix+2−2 pkgs/development/python-modules/shiboken2/nix_compile_cflags.patch+8−5
pkgs/development/python-modules/pyside2/default.nix+2−2
@@ -3,11 +3,11 @@
33
44stdenv.mkDerivation rec {
55 pname = "pyside2";
6− version = "5.12.3";
6+ version = "5.12.6";
77
88 src = fetchurl {
99 url = "https://download.qt.io/official_releases/QtForPython/pyside2/PySide2-${version}-src/pyside-setup-everywhere-src-${version}.tar.xz";
10− sha256 = "0hk89jm8pa0q6kifask5rrffa3bvx02dg2f97ibv7wds9dysnyjg";
10+ sha256 = "1n45l6xxyxs6cfp2l4rp8qs1c2fyfwyrdxa4qcpwfsqsi51rydsk";
1111 };
1212
1313 patches = [
pkgs/development/python-modules/shiboken2/nix_compile_cflags.patch+8−5
@@ -1,6 +1,6 @@
1−--- pyside-setup-everywhere-src-5.12.3/sources/shiboken2/ApiExtractor/clangparser/compilersupport.cpp~ 2019-06-15 10:31:04.712949189 +0200
2−+++ pyside-setup-everywhere-src-5.12.3/sources/shiboken2/ApiExtractor/clangparser/compilersupport.cpp 2019-06-15 11:52:52.894987343 +0200
3−@@ -317,15 +317,15 @@
1+--- pyside-setup-everywhere-src-5.12.6/sources/shiboken2/ApiExtractor/clangparser/compilersupport.cpp~ 2020-07-08 14:37:13.022476435 -0700
2++++ pyside-setup-everywhere-src-5.12.6/sources/shiboken2/ApiExtractor/clangparser/compilersupport.cpp 2020-07-08 14:37:18.271484269 -0700
3+@@ -330,17 +330,15 @@
44 }
55 #endif // NEED_CLANG_BUILTIN_INCLUDES
66
@@ -9,10 +9,12 @@
99- // A fix for this has been added to Clang 5.0, so, the code can be removed
1010- // once Clang 5.0 is the minimum version.
1111- if (needsGppInternalHeaders()) {
12−- const HeaderPaths gppPaths = gppInternalIncludePaths(QStringLiteral("g++"));
12+- const HeaderPaths gppPaths = gppInternalIncludePaths(compilerFromCMake(QStringLiteral("g++")));
1313- for (const HeaderPath &h : gppPaths) {
14−- if (h.path.contains("c++"))
14+- if (h.path.contains("c++")
15+- || h.path.contains("sysroot")) { // centOS
1516- headerPaths.append(h);
17+- }
1618+ const HeaderPaths gppPaths = gppInternalIncludePaths(QStringLiteral("g++"));
1719+ for (const HeaderPath &h : gppPaths) {
1820+ // PySide2 requires that Qt headers are not -isystem
@@ -25,3 +27,4 @@
2527 }
2628 }
2729 #else
30+