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

Minor cleanups.

Browse source
This commit is contained in:
Ben Wolsieffer 2023-08-02 16:07:59 -04:00
parent 02ef880f6e
commit 68ec618c69
2 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
distros/melodic/overrides.nix
View file

@ -97,7 +97,7 @@ rosSelf: rosSuper: with rosSelf.lib; {
sha256 = "0h148anbaqgch6n69pxsvs1c9wmykgd052wmzgdia7qpz8w6p8dl"; sha256 = "0h148anbaqgch6n69pxsvs1c9wmykgd052wmzgdia7qpz8w6p8dl";
}; };
# Spends an hour time trying to download npm packages before failing. # Spends an hour trying to download npm packages before failing.
vapor-master = rosSuper.vapor-master.overrideAttrs ({ vapor-master = rosSuper.vapor-master.overrideAttrs ({
meta ? {}, ... meta ? {}, ...
}: { }: {

4
distros/ros1-overlay.nix
View file

@ -51,6 +51,8 @@ rosSelf: rosSuper: with rosSelf.lib; {
nativeBuildInputs = nativeBuildInputs ++ [ self.pkg-config ]; nativeBuildInputs = nativeBuildInputs ++ [ self.pkg-config ];
}); });
roscpp = patchBoostSignals rosSuper.roscpp;
# rviz does not support shiboken/pyside2 and SIP4 is broken with the latest # 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 # pyqt5. This applies a patch to make pyqt5 compatible with SIP 4 and uses
# SIP 4 with python-qt-binding for rviz only. # SIP 4 with python-qt-binding for rviz only.
@ -89,6 +91,4 @@ rosSelf: rosSuper: with rosSelf.lib; {
wrapQtApp "$out/lib/rviz/rviz" wrapQtApp "$out/lib/rviz/rviz"
''; '';
}); });
roscpp = patchBoostSignals rosSuper.roscpp;
} }