From d3c90ec939b66bfe5a9d8f741defde71e68ee933 Mon Sep 17 00:00:00 2001 From: Ben Wolsieffer Date: Thu, 10 Nov 2022 15:23:24 -0500 Subject: [PATCH] qt-gui-cpp: replace SIP 4 with Shiboken to fix build Qt5 is no longer compatible with SIP 4. --- distros/distro-overlay.nix | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/distros/distro-overlay.nix b/distros/distro-overlay.nix index a882615ff4..46556f6e1e 100644 --- a/distros/distro-overlay.nix +++ b/distros/distro-overlay.nix @@ -178,12 +178,10 @@ let propagatedNativeBuildInputs ? [], postPatch ? "", ... }: { - propagatedNativeBuildInputs = propagatedNativeBuildInputs ++ [ rosSelf.pythonPackages.sip_4 ]; - postPatch = '' - sed -e "1 i\\import PyQt5" \ - -e "s#sipconfig\._pkg_config\['default_mod_dir'\], 'PyQt5'#PyQt5.__path__[0]#" \ - -i cmake/sip_configure.py - '' + postPatch; + propagatedNativeBuildInputs = propagatedNativeBuildInputs ++ (with rosSelf.pythonPackages; [ + shiboken2 + pyside2 + ]); dontWrapQtApps = true;