From 57b55638e19fc9cb7e869faa7d75746471eab41c Mon Sep 17 00:00:00 2001 From: Ben Wolsieffer Date: Thu, 26 Nov 2020 11:33:06 -0500 Subject: [PATCH] gazebo: 11.1.0 -> 11.2.0 --- pkgs/gazebo/default.nix | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/pkgs/gazebo/default.nix b/pkgs/gazebo/default.nix index 381f36daa6..e2c7f2aba6 100644 --- a/pkgs/gazebo/default.nix +++ b/pkgs/gazebo/default.nix @@ -4,11 +4,11 @@ , ffmpeg, ignition, ignition-cmake ? ignition.cmake0 , ignition-common ? ignition.common, ignition-math ? ignition.math4 , ignition-transport ? ignition.transport, ignition-msgs ? ignition.msgs -, ignition-fuel-tools ? ignition.fuel-tools, breakpointHook +, ignition-fuel-tools ? ignition.fuel-tools , bullet, withBulletEngineSupport ? false -, version ? "11.1.0" -, srcSha256 ? "1gj1apryvlnr0wn950r57019k5379ixkqagwp8igd5k7ld1p6a1f" +, version ? "11.2.0" +, srcSha256 ? "1wvw7744fyagkr4jnr3klkca88pqm6njsa5fx6m52d4x7rbi3jh5" , ... }: with lib; mkDerivation rec { @@ -22,11 +22,7 @@ mkDerivation rec { patches = [ # Fix CMake relative path assumptions - (fetchpatch (if lib.versionAtLeast version "11" then { - # https://github.com/osrf/gazebo/pull/2778 - url = "https://github.com/osrf/gazebo/commit/6d1ef09243326fd4ef837b4638671dd707f77ca4.patch"; - sha256 = "0s0wyg0fd0y5mxn6kq1b2y5a6agrvplnpcx3x9bzmhz0ffn8xkw5"; - } else { + (optional (lib.versionOlder version "11") (fetchpatch { # https://github.com/osrf/gazebo/pull/2779 url = "https://github.com/osrf/gazebo/commit/8d8dcff5c0c92c5903883f3215236c6bf6ff1a5f.patch"; sha256 = "1q13cfscf02qkkp0wq03phdakl4i0qzlibiw0k76p50dygw2z864"; @@ -37,7 +33,7 @@ mkDerivation rec { cmakeFlags = [ "-DUSE_HOST_CFLAGS=False" ]; - nativeBuildInputs = [ cmake pkgconfig ronn breakpointHook ]; + nativeBuildInputs = [ cmake pkgconfig ronn ]; buildInputs = [ libGL