From 36e236ef49b09a2e019a30b8315f7b29c2af5f33 Mon Sep 17 00:00:00 2001 From: Jonas Meurer Date: Thu, 23 May 2024 22:37:45 +0200 Subject: [PATCH] python3Packages.shiboken6: restore backwards compatibility with 6.6 Pyside 6.7.0 (more specific 5d05065b57f5e37c2229ff6a2d98d936c5c7f2bb) introduced a change which is partly backwards compatible. This patch allows packages (e.g. Cutter), which depend on the backwards compatibility, to build again. --- .../development/python-modules/shiboken6/default.nix | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/shiboken6/default.nix b/pkgs/development/python-modules/shiboken6/default.nix index 98ebbecd521d..5bf11c0a14a5 100644 --- a/pkgs/development/python-modules/shiboken6/default.nix +++ b/pkgs/development/python-modules/shiboken6/default.nix @@ -1,6 +1,7 @@ { lib, fetchurl, + fetchpatch, llvmPackages, python, cmake, @@ -23,7 +24,16 @@ stdenv'.mkDerivation rec { sourceRoot = "pyside-setup-everywhere-src-${version}/sources/${pname}"; - patches = [ ./fix-include-qt-headers.patch ]; + patches = [ + ./fix-include-qt-headers.patch + # Remove this patch when updating to 6.8.0 + (fetchpatch { + name = "backwards-compatibility-with-6.6.x.patch"; + url = "https://code.qt.io/cgit/pyside/pyside-setup.git/patch/?id=4f9a20e3635f4f0957e0774588b1d9156e88a572"; + hash = "sha256-B2jhLWopgaSF/rUXMZFPZArDUNojlBgn7kdVyQull+I="; + stripLen = 2; + }) + ]; nativeBuildInputs = [ cmake