Merge commit 'bf6f7a2cf02f297d66125a5dae01ebe9ed957ec6' into staging

lopsided98 · Feb 26, 2023 · 3fa6f9f · 3fa6f9f
2 parents ca325a1 + bf6f7a2
commit 3fa6f9f
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 2 deletions.
diff --git a/distros/distro-overlay.nix b/distros/distro-overlay.nix
@@ -178,8 +178,7 @@ let
     pr2-tilt-laser-interface = patchBoostSignals rosSuper.pr2-tilt-laser-interface;
 
     python-qt-binding = rosSuper.python-qt-binding.overrideAttrs ({
-      propagatedNativeBuildInputs ? [],
-      postPatch ? "", ...
+      propagatedNativeBuildInputs ? [], ...
     }: {
       propagatedNativeBuildInputs = propagatedNativeBuildInputs ++ (with rosSelf.pythonPackages; [
         shiboken2

diff --git a/distros/ros1-overlay.nix b/distros/ros1-overlay.nix
@@ -51,5 +51,35 @@ rosSelf: rosSuper: with rosSelf.lib; {
     nativeBuildInputs = nativeBuildInputs ++ [ self.pkg-config ];
   });
 
+  rviz = rosSuper.rviz.override {
+    python-qt-binding = (rosSuper.python-qt-binding.override {
+      python3Packages = rosSelf.python3Packages.override {
+        overrides = pySelf: pySuper: {
+          pyqt5 = rosSelf.python3Packages.pyqt5.overrideAttrs ({
+            patches ? [], ...
+          }: {
+            patches = patches ++ [ (self.fetchpatch {
+              url = "https://aur.archlinux.org/cgit/aur.git/plain/restore-sip4-support.patch?h=python-pyqt5-sip4&id=6e712e6c588d550a1a6f83c1b37c2c9135aae6ba";
+              sha256 = "sha256-NfMe/EK1Uj88S82xZSm+A6js3PK9mlgsaci/kinlsy8=";
+            }) ];
+          });
+        };
+      };
+    }).overrideAttrs({
+      propagatedNativeBuildInputs ? [],
+      postPatch ? "", ...
+    }: {
+      # rviz1 does not support shiboken/pyside2
+      propagatedNativeBuildInputs = (rosSelf.lib.subtractLists
+        (with rosSelf.pythonPackages; [ shiboken2 pyside2 ])
+        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;
+    });
+  };
+
   roscpp = patchBoostSignals rosSuper.roscpp;
 }