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

Fix mavlink.

Browse source
This commit is contained in:
Ben Wolsieffer 2020-02-04 15:18:18 -05:00
parent 9634117c07
commit f0d16c56c6
2 changed files with 18 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

4
base.nix
View file

@ -35,6 +35,10 @@ self: super: with super.lib; let
vcstools = pySelf.callPackage ./vcstools { }; vcstools = pySelf.callPackage ./vcstools { };
wstool = pySelf.callPackage ./wstool { }; wstool = pySelf.callPackage ./wstool { };
} // optionalAttrs pySuper.isPy3k {
# This has to be done here (rather than in rosPackages) because
# packageOverrides doesn't compose
wxPython = pySelf.wxPython_4_0;
}; };
}); });

14
distros/distro-overlay.nix
View file

@ -142,6 +142,20 @@ let
nativeBuildInputs = nativeBuildInputs ++ [ self.pkgconfig ]; nativeBuildInputs = nativeBuildInputs ++ [ self.pkgconfig ];
}); });
mavlink = rosSuper.mavlink.overrideAttrs ({
patches ? [], postPatch ? "", ...
}: {
patches = patches ++ [ (self.fetchpatch {
url = "https://github.com/mavlink/mavlink-gbp-release/commit/026cc233ede704a9ef6a662df09f567325994e4e.patch";
sha256 = "1570pspscpi94fx4slx6vgyzy51q0jdndr7g8gl381zirb2i1zmj";
stripLen = 1;
}) ];
postPatch = postPatch + ''
substituteInPlace CMakeLists.txt --replace /usr/bin/env '${self.coreutils}/bin/env'
patchShebangs pymavlink/tools/mavgen.py
'';
});
message-filters = patchBoostSignals rosSuper.message-filters; message-filters = patchBoostSignals rosSuper.message-filters;
message-relay = rosSuper.message-relay.overrideAttrs ({ message-relay = rosSuper.message-relay.overrideAttrs ({