From c3e41d9df500141e7c3c3da4756428ddecb67143 Mon Sep 17 00:00:00 2001
From: Ben Wolsieffer <benwolsieffer@gmail.com>
Date: Tue, 2 May 2023 17:30:14 -0400
Subject: [PATCH] Move all rviz overrides to ros1-overlay.

---
 distros/distro-overlay.nix | 10 ----------
 distros/ros1-overlay.nix   | 13 +++++++++++--
 2 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/distros/distro-overlay.nix b/distros/distro-overlay.nix
index 56db09ea7d..5ffa9fd243 100644
--- a/distros/distro-overlay.nix
+++ b/distros/distro-overlay.nix
@@ -319,16 +319,6 @@ let
       nativeBuildInputs = nativeBuildInputs ++ [ self.qt5.wrapQtAppsHook ];
     });
 
-    rviz = rosSuper.rviz.overrideAttrs ({
-      nativeBuildInputs ? [], postFixup ? "", ...
-    }: {
-      dontWrapQtApps = false;
-      nativeBuildInputs = nativeBuildInputs ++ [ self.qt5.wrapQtAppsHook ];
-      postFixup = postFixup + ''
-        wrapQtApp "$out/lib/rviz/rviz"
-      '';
-    });
-
     rviz-ogre-vendor = rosSuper.rviz-ogre-vendor.overrideAttrs ({
       preFixup ? "", ...
     }: {
diff --git a/distros/ros1-overlay.nix b/distros/ros1-overlay.nix
index 43839e7b6e..d5d2153316 100644
--- a/distros/ros1-overlay.nix
+++ b/distros/ros1-overlay.nix
@@ -54,7 +54,7 @@ rosSelf: rosSuper: with rosSelf.lib; {
   # rviz does not support shiboken/pyside2 and SIP4 is broken with the latest
   # pyqt5. This applies a patch to make pyqt5 compatible with SIP 4 and uses
   # SIP 4 with python-qt-binding for rviz only.
-  rviz = rosSuper.rviz.override {
+  rviz = (rosSuper.rviz.override {
     python-qt-binding = (rosSuper.python-qt-binding.override {
       python3Packages = rosSelf.python3Packages.overrideScope (pyFinal: pyPrev: {
         pyqt5 = pyPrev.pyqt5.overrideAttrs ({
@@ -79,7 +79,16 @@ rosSelf: rosSuper: with rosSelf.lib; {
             -i cmake/sip_configure.py
       '' + postPatch;
     });
-  };
+  }).overrideAttrs ({
+    nativeBuildInputs ? [],
+    postFixup ? "", ...
+  }: {
+    dontWrapQtApps = false;
+    nativeBuildInputs = nativeBuildInputs ++ [ self.qt5.wrapQtAppsHook ];
+    postFixup = postFixup + ''
+      wrapQtApp "$out/lib/rviz/rviz"
+    '';
+  });
 
   roscpp = patchBoostSignals rosSuper.roscpp;
 }