python3Packages.pyside6: fix building against qt 6.5.3
In https://codereview.qt-project.org/c/qt/qtbase/+/372719, certain logging macro definitions were changed slightly, altering their semantics, and requiring changes to callsites. Despite the Qt Project releasing version 6.5.3 of the base library, they've yet to give pyside the same treatment, so let's pull in the fix until that changes. Change-Id: Ic9edabcf1b3d96bf62fbd9356366a9982ab9ecae Fixes: #258442
This commit is contained in:
parent
0f6fb1455f
commit
b3314b317c
|
@ -1,5 +1,6 @@
|
||||||
{ lib
|
{ lib
|
||||||
, stdenv
|
, stdenv
|
||||||
|
, fetchpatch2
|
||||||
, cmake
|
, cmake
|
||||||
, ninja
|
, ninja
|
||||||
, python
|
, python
|
||||||
|
@ -15,6 +16,15 @@ stdenv.mkDerivation rec {
|
||||||
|
|
||||||
sourceRoot = "pyside-setup-everywhere-src-${version}/sources/${pname}";
|
sourceRoot = "pyside-setup-everywhere-src-${version}/sources/${pname}";
|
||||||
|
|
||||||
|
patches = [
|
||||||
|
# Needed to build against qt 6.5.3, until pyside 6.5.3 is released
|
||||||
|
(fetchpatch2 {
|
||||||
|
url = "https://code.qt.io/cgit/pyside/pyside-setup.git/patch/sources/pyside6?id=63ef7628091c8827e3d0d688220d3ae165587eb2";
|
||||||
|
hash = "sha256-TN1xdBkrzZhNontShMC1SKyJK6a8fOk/Di3zX3kv5+I=";
|
||||||
|
stripLen = 2;
|
||||||
|
})
|
||||||
|
];
|
||||||
|
|
||||||
# FIXME: cmake/Macros/PySideModules.cmake supposes that all Qt frameworks on macOS
|
# 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.
|
# reside in the same directory as QtCore.framework, which is not true for Nix.
|
||||||
postPatch = lib.optionalString stdenv.isLinux ''
|
postPatch = lib.optionalString stdenv.isLinux ''
|
||||||
|
|
Loading…
Reference in a new issue