movefasta/nix-ros-overlay
1
0
Fork 0
mirror of https://github.com/lopsided98/nix-ros-overlay.git synced 2025-06-10 09:52:22 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Move all rviz overrides to ros1-overlay.

Browse source
This commit is contained in:
Ben Wolsieffer 2023-05-02 17:30:14 -04:00
parent b10d5411ad
commit c3e41d9df5
2 changed files with 11 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

10
distros/distro-overlay.nix
View file

@ -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 ? "", ...
}: {

13
distros/ros1-overlay.nix
View file

@ -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;
}