pyrox.dev
lol
Merge pull request #253534 from reckenrode/pyside6-fix
python3Packages.{shiboken,pyside}6: 6.5.0 -> 6.5.2
authored by
Weijia Wang
and committed by
GitHub
07eab2ec
ebe44153
+8
-5
+1
-1
pkgs/development/python-modules/pyside6/default.nix
+1
-1
pkgs/development/python-modules/pyside6/default.nix
···
14
14
15
15
inherit (shiboken6) version src;
16
16
17
-
sourceRoot = "pyside-setup-everywhere-src-${lib.versions.majorMinor version}/sources/${pname}";
17
+
sourceRoot = "pyside-setup-everywhere-src-${version}/sources/${pname}";
18
18
19
19
# FIXME: cmake/Macros/PySideModules.cmake supposes that all Qt frameworks on macOS
20
20
# reside in the same directory as QtCore.framework, which is not true for Nix.
+7
-4
pkgs/development/python-modules/shiboken6/default.nix
+7
-4
pkgs/development/python-modules/shiboken6/default.nix
···
9
9
, libxcrypt
10
10
}:
11
11
12
-
llvmPackages.stdenv.mkDerivation rec {
12
+
let
13
+
stdenv' = if stdenv.cc.isClang then stdenv else llvmPackages.stdenv;
14
+
in
15
+
stdenv'.mkDerivation rec {
13
16
pname = "shiboken6";
14
-
version = "6.5.0";
17
+
version = "6.5.2";
15
18
16
19
src = fetchurl {
17
20
# https://download.qt.io/official_releases/QtForPython/shiboken6/
18
21
url = "https://download.qt.io/official_releases/QtForPython/shiboken6/PySide6-${version}-src/pyside-setup-everywhere-src-${version}.tar.xz";
19
-
sha256 = "sha256-bvU7KRJyZ+OBkX5vk5nOdg7cBkTNWDGYix3nLJ1YOrQ=";
22
+
sha256 = "sha256-kNvx0U/NQcmKfL6kS4pJUeENC3mOFUdJdW5JRmVNG6g";
20
23
};
21
24
22
-
sourceRoot = "pyside-setup-everywhere-src-${lib.versions.majorMinor version}/sources/${pname}";
25
+
sourceRoot = "pyside-setup-everywhere-src-${version}/sources/${pname}";
23
26
24
27
patches = [
25
28
./fix-include-qt-headers.patch