Commit ad0be8c5 authored by Jonas Meurer's avatar Jonas Meurer Committed by github-actions[bot]
Browse files

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.

(cherry picked from commit 36e236ef)
parent 4f6d278e

pkgs/development/python-modules/shiboken6/default.nix

+11 −1
Original line number Diff line number Diff line 
{

  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