Use wrapQtAppsHook.

This commit is contained in:
Ben Wolsieffer 2020-03-04 17:37:15 -05:00
parent cdcb85b14e
commit 0fd7813c2c

View file

@ -223,27 +223,15 @@ let
}); });
rqt-gui = rosSuper.rqt-gui.overrideAttrs ({ rqt-gui = rosSuper.rqt-gui.overrideAttrs ({
nativeBuildInputs ? [], nativeBuildInputs ? [], ...
postFixup ? "", ...
}: { }: {
nativeBuildInputs = nativeBuildInputs ++ [ self.makeWrapper ]; nativeBuildInputs = nativeBuildInputs ++ [ self.qt5.wrapQtAppsHook ];
postFixup = ''
wrapProgram $out/bin/rqt \
--prefix QT_PLUGIN_PATH : "${self.qt5.qtbase.bin}/${self.qt5.qtbase.qtPluginPrefix}"
'' + postFixup;
}); });
rviz = rosSuper.rviz.overrideAttrs ({ rviz = rosSuper.rviz.overrideAttrs ({
nativeBuildInputs ? [], nativeBuildInputs ? [], ...
postFixup ? "", ...
}: { }: {
nativeBuildInputs = nativeBuildInputs ++ [ self.makeWrapper ]; nativeBuildInputs = nativeBuildInputs ++ [ self.qt5.wrapQtAppsHook ];
postFixup = ''
wrapProgram $out/bin/rviz \
--prefix QT_PLUGIN_PATH : "${self.qt5.qtbase.bin}/${self.qt5.qtbase.qtPluginPrefix}"
'' + postFixup;
}); });
rviz-ogre-vendor = rosSuper.rviz-ogre-vendor.overrideAttrs ({ rviz-ogre-vendor = rosSuper.rviz-ogre-vendor.overrideAttrs ({