pyrox.dev
lol
python3Packages.pyside2: 5.12.3 -> 5.12.6
fixes #91726
+10
-7
+2
-2
pkgs/development/python-modules/pyside2/default.nix
+2
-2
pkgs/development/python-modules/pyside2/default.nix
···
3
3
4
4
stdenv.mkDerivation rec {
5
5
pname = "pyside2";
6
-
version = "5.12.3";
6
+
version = "5.12.6";
7
7
8
8
src = fetchurl {
9
9
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";
11
11
};
12
12
13
13
patches = [
+8
-5
pkgs/development/python-modules/shiboken2/nix_compile_cflags.patch
+8
-5
pkgs/development/python-modules/shiboken2/nix_compile_cflags.patch
···
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 @@
4
4
}
5
5
#endif // NEED_CLANG_BUILTIN_INCLUDES
6
6
···
9
9
- // A fix for this has been added to Clang 5.0, so, the code can be removed
10
10
- // once Clang 5.0 is the minimum version.
11
11
- if (needsGppInternalHeaders()) {
12
-
- const HeaderPaths gppPaths = gppInternalIncludePaths(QStringLiteral("g++"));
12
+
- const HeaderPaths gppPaths = gppInternalIncludePaths(compilerFromCMake(QStringLiteral("g++")));
13
13
- for (const HeaderPath &h : gppPaths) {
14
-
- if (h.path.contains("c++"))
14
+
- if (h.path.contains("c++")
15
+
- || h.path.contains("sysroot")) { // centOS
15
16
- headerPaths.append(h);
17
+
- }
16
18
+ const HeaderPaths gppPaths = gppInternalIncludePaths(QStringLiteral("g++"));
17
19
+ for (const HeaderPath &h : gppPaths) {
18
20
+ // PySide2 requires that Qt headers are not -isystem
···
25
27
}
26
28
}
27
29
#else
30
+