diff --git a/distros/distro-overlay.nix b/distros/distro-overlay.nix
index 9a649db412..998f339918 100644
--- a/distros/distro-overlay.nix
+++ b/distros/distro-overlay.nix
@@ -223,27 +223,15 @@ let
     });
 
     rqt-gui = rosSuper.rqt-gui.overrideAttrs ({
-      nativeBuildInputs ? [],
-      postFixup ? "", ...
+      nativeBuildInputs ? [], ...
     }: {
-      nativeBuildInputs = nativeBuildInputs ++ [ self.makeWrapper ];
-
-      postFixup = ''
-        wrapProgram $out/bin/rqt \
-          --prefix QT_PLUGIN_PATH : "${self.qt5.qtbase.bin}/${self.qt5.qtbase.qtPluginPrefix}"
-      '' + postFixup;
+      nativeBuildInputs = nativeBuildInputs ++ [ self.qt5.wrapQtAppsHook ];
     });
 
     rviz = rosSuper.rviz.overrideAttrs ({
-      nativeBuildInputs ? [],
-      postFixup ? "", ...
+      nativeBuildInputs ? [], ...
     }: {
-      nativeBuildInputs = nativeBuildInputs ++ [ self.makeWrapper ];
-
-      postFixup = ''
-        wrapProgram $out/bin/rviz \
-          --prefix QT_PLUGIN_PATH : "${self.qt5.qtbase.bin}/${self.qt5.qtbase.qtPluginPrefix}"
-      '' + postFixup;
+      nativeBuildInputs = nativeBuildInputs ++ [ self.qt5.wrapQtAppsHook ];
     });
 
     rviz-ogre-vendor = rosSuper.rviz-ogre-vendor.overrideAttrs ({