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.1.0 -> 11.2.0

Browse source
This commit is contained in:
Ben Wolsieffer 2020-11-26 11:33:06 -05:00
parent 2f8fa047c3
commit 57b55638e1
1 changed files with 5 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

14
pkgs/gazebo/default.nix
View file

@ -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