Merge pull request #253534 from reckenrode/pyside6-fix

python3Packages.{shiboken,pyside}6: 6.5.0 -> 6.5.2
This commit is contained in:
Weijia Wang 2023-09-06 17:50:13 +02:00 committed by GitHub
commit 07eab2ec18
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 5 deletions

View file

@ -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.

View file

@ -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