From c25cebd3675984357c2806847b81c3fd7a5e863d Mon Sep 17 00:00:00 2001 From: midchildan Date: Mon, 13 May 2024 02:39:51 +0900 Subject: [PATCH] fix: cutter build --- nix/overlays/cutter-pyside-2404.patch | 15 +++++++++++++++ nix/overlays/nixpkgs.nix | 3 +++ 2 files changed, 18 insertions(+) create mode 100644 nix/overlays/cutter-pyside-2404.patch diff --git a/nix/overlays/cutter-pyside-2404.patch b/nix/overlays/cutter-pyside-2404.patch new file mode 100644 index 00000000..34d7105a --- /dev/null +++ b/nix/overlays/cutter-pyside-2404.patch @@ -0,0 +1,15 @@ +Fix breakage caused by +https://github.com/pyside/pyside-setup/commit/5d05065b57f5e37c2229ff6a2d98d936c5c7f2bb + +diff -Naur a/src/plugins/PluginManager.cpp b/src/plugins/PluginManager.cpp +--- a/src/plugins/PluginManager.cpp 2024-05-13 02:21:36 ++++ b/src/plugins/PluginManager.cpp 2024-05-13 02:29:46 +@@ -215,7 +215,7 @@ + } + + PythonToCppFunc pythonToCpp = Shiboken::Conversions::isPythonToCppPointerConvertible( +- reinterpret_cast(SbkCutterBindingsTypes[SBK_CUTTERPLUGIN_IDX]), ++ SbkCutterBindingsTypeStructs[SBK_CUTTERPLUGIN_IDX].type, + pluginObject); + if (!pythonToCpp) { + qWarning() << "Plugin's create_cutter_plugin() function did not return an instance of " diff --git a/nix/overlays/nixpkgs.nix b/nix/overlays/nixpkgs.nix index 35da9f1a..a450d988 100644 --- a/nix/overlays/nixpkgs.nix +++ b/nix/overlays/nixpkgs.nix @@ -3,4 +3,7 @@ final: prev: { + cutter = prev.cutter.overrideAttrs (old: { + patches = (old.patches or [ ]) ++ [ ./cutter-pyside-2404.patch ]; + }); }