From a237432ff5fa006ce48f64d3b268890833f8010e Mon Sep 17 00:00:00 2001 From: Ben Wolsieffer Date: Sat, 27 Nov 2021 00:20:40 -0500 Subject: [PATCH] gazebo_11: add patch to fix installation paths --- pkgs/gazebo/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/gazebo/default.nix b/pkgs/gazebo/default.nix index 69ce123257..e5ad44f559 100644 --- a/pkgs/gazebo/default.nix +++ b/pkgs/gazebo/default.nix @@ -31,6 +31,12 @@ mkDerivation rec { lib.optional (lib.versionOlder version "11.3.0") (fetchpatch { url = "https://github.com/osrf/gazebo/commit/25d3381c083a9eeafcee34ef648339a83e192676.patch"; sha256 = "1qixrz2jiqdc37mgcsnv562m7mzr6w0rd67fmkr5710n6dnky4y7"; + }) ++ + # Fix CMake relative install path assumptions + # https://github.com/osrf/gazebo/pull/3138 + lib.optional (lib.versionAtLeast version "11.8.0") (fetchpatch { + url = "https://github.com/osrf/gazebo/commit/9bf5dac1546f3982d9da783a6ac5d7e674ddbe24.patch"; + sha256 = "0h9fmch8rgnsi3gnxvwfp0g9jgzy0z9p7nah005qw9lzmkvdrvs7"; }); enableParallelBuilding = true;