Skip to content

Commit

Permalink
Minor cleanups.
Browse files Browse the repository at this point in the history
  • Loading branch information
lopsided98 committed Aug 2, 2023
1 parent 02ef880 commit 68ec618
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion distros/melodic/overrides.nix
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ rosSelf: rosSuper: with rosSelf.lib; {
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 ({
meta ? {}, ...
}: {
Expand Down
4 changes: 2 additions & 2 deletions distros/ros1-overlay.nix
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,8 @@ rosSelf: rosSuper: with rosSelf.lib; {
nativeBuildInputs = nativeBuildInputs ++ [ self.pkg-config ];
});

roscpp = patchBoostSignals rosSuper.roscpp;

# 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.
Expand Down Expand Up @@ -89,6 +91,4 @@ rosSelf: rosSuper: with rosSelf.lib; {
wrapQtApp "$out/lib/rviz/rviz"
'';
});

roscpp = patchBoostSignals rosSuper.roscpp;
}

0 comments on commit 68ec618

Please sign in to comment.