movefasta/nix-ros-overlay
1
0
Fork 0
mirror of https://github.com/lopsided98/nix-ros-overlay.git synced 2025-07-14 14:10:37 +03:00
Code Activity

gazebo_11: fix pkgconfig prefix path

Browse source
This commit is contained in:
Ben Wolsieffer 2021-08-30 17:15:40 -04:00
parent 7929e0343a
commit 54f5324573
1 changed files with 12 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

18
pkgs/gazebo/default.nix
View file

@ -20,12 +20,18 @@ 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";
});
patches =
# Fix compatibility with qwt headers not in subdirectory
# https://github.com/osrf/gazebo/pull/2887
lib.optional (lib.versionOlder version "11.3.0") (fetchpatch {
url = "https://github.com/osrf/gazebo/commit/25d3381c083a9eeafcee34ef648339a83e192676.patch";
sha256 = "1qixrz2jiqdc37mgcsnv562m7mzr6w0rd67fmkr5710n6dnky4y7";
}) ++
# Fix pkgconfig prefix path
lib.optional (lib.versionAtLeast version "11.4.0") (fetchpatch {
url = "https://github.com/osrf/gazebo/commit/a7e6e1c1de46c3eb7eecab0de1263f7360ef9f42.patch";
sha256 = "09y5ggx74mc70np7x1cj8p936jqkx4f6nvly0qscsjrv7x6gsb6j";
});
enableParallelBuilding = true;