diff options
| author | Weijia Wang <9713184+wegank@users.noreply.github.com> | 2023-09-06 17:50:13 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-09-06 17:50:13 +0200 |
| commit | 07eab2ec1833721e7d5669c19ebe210aef670327 (patch) | |
| tree | 6478d8b0c7ba1153b51bfc00eaf0628c35d3a3f0 /pkgs/development | |
| parent | ebe441536e2fd154777f898f14ec847b6a0d1b6c (diff) | |
| parent | 0b97588e993f352c589c34bb99626449ffb451ca (diff) | |
Merge pull request #253534 from reckenrode/pyside6-fix
python3Packages.{shiboken,pyside}6: 6.5.0 -> 6.5.2Diffstat (limited to 'pkgs/development')
| -rw-r--r-- | pkgs/development/python-modules/pyside6/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/development/python-modules/shiboken6/default.nix | 11 |
2 files changed, 8 insertions, 5 deletions
diff --git a/pkgs/development/python-modules/pyside6/default.nix b/pkgs/development/python-modules/pyside6/default.nix index 0cf06e885c13e..bf467bc1dd22b 100644 --- a/pkgs/development/python-modules/pyside6/default.nix +++ b/pkgs/development/python-modules/pyside6/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { inherit (shiboken6) version src; - sourceRoot = "pyside-setup-everywhere-src-${lib.versions.majorMinor version}/sources/${pname}"; + sourceRoot = "pyside-setup-everywhere-src-${version}/sources/${pname}"; # FIXME: cmake/Macros/PySideModules.cmake supposes that all Qt frameworks on macOS # reside in the same directory as QtCore.framework, which is not true for Nix. diff --git a/pkgs/development/python-modules/shiboken6/default.nix b/pkgs/development/python-modules/shiboken6/default.nix index 9bf4f0d6482e0..d3412483933ca 100644 --- a/pkgs/development/python-modules/shiboken6/default.nix +++ b/pkgs/development/python-modules/shiboken6/default.nix @@ -9,17 +9,20 @@ , libxcrypt }: -llvmPackages.stdenv.mkDerivation rec { +let + stdenv' = if stdenv.cc.isClang then stdenv else llvmPackages.stdenv; +in +stdenv'.mkDerivation rec { pname = "shiboken6"; - version = "6.5.0"; + version = "6.5.2"; src = fetchurl { # https://download.qt.io/official_releases/QtForPython/shiboken6/ url = "https://download.qt.io/official_releases/QtForPython/shiboken6/PySide6-${version}-src/pyside-setup-everywhere-src-${version}.tar.xz"; - sha256 = "sha256-bvU7KRJyZ+OBkX5vk5nOdg7cBkTNWDGYix3nLJ1YOrQ="; + sha256 = "sha256-kNvx0U/NQcmKfL6kS4pJUeENC3mOFUdJdW5JRmVNG6g"; }; - sourceRoot = "pyside-setup-everywhere-src-${lib.versions.majorMinor version}/sources/${pname}"; + sourceRoot = "pyside-setup-everywhere-src-${version}/sources/${pname}"; patches = [ ./fix-include-qt-headers.patch |