movefasta/nix-ros-overlay
1
0
Fork 0
mirror of https://github.com/lopsided98/nix-ros-overlay.git synced 2025-07-14 06:00:38 +03:00
Code Activity

qt-gui-cpp: replace SIP 4 with Shiboken to fix build

Browse source 
Qt5 is no longer compatible with SIP 4.
This commit is contained in:
Ben Wolsieffer 2022-11-10 15:23:24 -05:00
parent 6fa03dc558
commit d3c90ec939
1 changed files with 4 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

10
distros/distro-overlay.nix
View file

@ -178,12 +178,10 @@ let
propagatedNativeBuildInputs ? [], propagatedNativeBuildInputs ? [],
postPatch ? "", ... postPatch ? "", ...
}: { }: {
propagatedNativeBuildInputs = propagatedNativeBuildInputs ++ [ rosSelf.pythonPackages.sip_4 ]; propagatedNativeBuildInputs = propagatedNativeBuildInputs ++ (with rosSelf.pythonPackages; [
postPatch = '' shiboken2
sed -e "1 i\\import PyQt5" \ pyside2
-e "s#sipconfig\._pkg_config\['default_mod_dir'\], 'PyQt5'#PyQt5.__path__[0]#" \ ]);
-i cmake/sip_configure.py
'' + postPatch;
dontWrapQtApps = true; dontWrapQtApps = true;