Skip to content

Commit 54f5324

Browse files
committed
gazebo_11: fix pkgconfig prefix path
1 parent 7929e03 commit 54f5324

File tree

1 file changed

+12
-6
lines changed

1 file changed

+12
-6
lines changed

pkgs/gazebo/default.nix

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,18 @@ mkDerivation rec {
2020
sha256 = srcSha256;
2121
};
2222

23-
# Fix compatibility with qwt headers not in subdirectory
24-
# https://github.com/osrf/gazebo/pull/2887
25-
patches = lib.optional (lib.versionOlder version "11.3.0") (fetchpatch {
26-
url = "https://github.com/osrf/gazebo/commit/25d3381c083a9eeafcee34ef648339a83e192676.patch";
27-
sha256 = "1qixrz2jiqdc37mgcsnv562m7mzr6w0rd67fmkr5710n6dnky4y7";
28-
});
23+
patches =
24+
# Fix compatibility with qwt headers not in subdirectory
25+
# https://github.com/osrf/gazebo/pull/2887
26+
lib.optional (lib.versionOlder version "11.3.0") (fetchpatch {
27+
url = "https://github.com/osrf/gazebo/commit/25d3381c083a9eeafcee34ef648339a83e192676.patch";
28+
sha256 = "1qixrz2jiqdc37mgcsnv562m7mzr6w0rd67fmkr5710n6dnky4y7";
29+
}) ++
30+
# Fix pkgconfig prefix path
31+
lib.optional (lib.versionAtLeast version "11.4.0") (fetchpatch {
32+
url = "https://github.com/osrf/gazebo/commit/a7e6e1c1de46c3eb7eecab0de1263f7360ef9f42.patch";
33+
sha256 = "09y5ggx74mc70np7x1cj8p936jqkx4f6nvly0qscsjrv7x6gsb6j";
34+
});
2935

3036
enableParallelBuilding = true;
3137

0 commit comments

Comments
 (0)