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

fix: remove tango-icons-vendor and pyside2 to build rqt for macos

Browse source 
add comments

comments

Update distro-overlay.nix

Update overrides.nix
This commit is contained in:
Steve Walker 2024-09-15 17:41:36 +08:00
parent dabd41fd0d
commit 8208742a4d
No known key found for this signature in database
2 changed files with 11 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

6
distros/distro-overlay.nix
View file

@ -185,9 +185,11 @@ let
}).overrideAttrs ({ }).overrideAttrs ({
propagatedBuildInputs ? [], ... propagatedBuildInputs ? [], ...
}: { }: {
# pyside2 is broken on macOS, needed for rqt build to succeed
propagatedBuildInputs = propagatedBuildInputs ++ (with rosSelf.pythonPackages; [ propagatedBuildInputs = propagatedBuildInputs ++ (with rosSelf.pythonPackages; [
pyside2
sip4 sip4
] ++ self.lib.optionals self.stdenv.isLinux [
pyside2
]); ]);
dontWrapQtApps = true; dontWrapQtApps = true;
@ -270,7 +272,7 @@ let
wrapQtApp "$out/lib/rqt_plot/rqt_plot" wrapQtApp "$out/lib/rqt_plot/rqt_plot"
''; '';
}); });
rqt-publisher = rosSuper.rqt-publisher.overrideAttrs ({ rqt-publisher = rosSuper.rqt-publisher.overrideAttrs ({
nativeBuildInputs ? [], postFixup ? "", ... nativeBuildInputs ? [], postFixup ? "", ...
}: { }: {

7
distros/humble/overrides.nix
View file

@ -133,6 +133,13 @@ in with lib; {
sha256 = "1255n51y1bjry97n4w60mgz6b9h14flfrxb01ihjf6pwvvfns8ag"; sha256 = "1255n51y1bjry97n4w60mgz6b9h14flfrxb01ihjf6pwvvfns8ag";
}; };
# Needed for rqt build to succeed. tango-icons-theme will be installed by this package on macOS.
tango-icons-vendor = rosSuper.tango-icons-vendor.overrideAttrs ({
propagatedBuildInputs ? [], ...
}: {
propagatedBuildInputs = if self.stdenv.isDarwin then [] else propagatedBuildInputs;
});
urdfdom = rosSuper.urdfdom.overrideAttrs ({ urdfdom = rosSuper.urdfdom.overrideAttrs ({
patches ? [], ... patches ? [], ...
}: { }: {