mirror of
https://github.com/lopsided98/nix-ros-overlay.git
synced 2025-06-10 01:42:24 +03:00
gazebo_9: fix build
Gazebo 9 assumes qwt headers are in a qwt/ subdirectory. This commit backports a patch from Gazebo 11 to fix this.
This commit is contained in:
parent
eba1ff3516
commit
2753f77330
2 changed files with 7 additions and 7 deletions
|
@ -102,13 +102,6 @@ in {
|
|||
python37 = pythonOverridesFor super.python37;
|
||||
python38 = pythonOverridesFor super.python38;
|
||||
|
||||
qwt6 = super.qwt6.overrideAttrs ({ postInstall ? "", ... }: {
|
||||
# Gazebo 9 expects headers to be in subdirectory
|
||||
postInstall = postInstall + ''
|
||||
ln -s "$out/include" "$out/include/qwt"
|
||||
'';
|
||||
});
|
||||
|
||||
sdformat_4 = self.callPackage ./sdformat/4.nix { };
|
||||
sdformat_6 = self.callPackage ./sdformat/6.nix { };
|
||||
sdformat_9 = self.callPackage ./sdformat { };
|
||||
|
|
|
@ -20,6 +20,13 @@ mkDerivation rec {
|
|||
sha256 = srcSha256;
|
||||
};
|
||||
|
||||
# Fix compatibility with qwt headers not in subdirectory
|
||||
# https://github.com/osrf/gazebo/pull/2887
|
||||
patches = lib.optional (lib.versionOlder version "11.3.0") (fetchpatch {
|
||||
url = "https://github.com/osrf/gazebo/commit/25d3381c083a9eeafcee34ef648339a83e192676.patch";
|
||||
sha256 = "1qixrz2jiqdc37mgcsnv562m7mzr6w0rd67fmkr5710n6dnky4y7";
|
||||
});
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
cmakeFlags = [ "-DUSE_HOST_CFLAGS=False" ];
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue