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_9: remove

Browse source
This commit is contained in:
Ben Wolsieffer 2023-10-03 20:44:06 -04:00
parent 96484c34ac
commit 5cdd99d43b
3 changed files with 1 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

1
pkgs/default.nix
View file

@ -85,7 +85,6 @@ in {
colcon-zsh
];
gazebo_9 = self.libsForQt5.callPackage ./gazebo/9.nix { };
gazebo_11 = self.libsForQt5.callPackage ./gazebo { };
gazebo = self.gazebo_11;

12
pkgs/gazebo/9.nix
View file

@ -1,12 +0,0 @@
{ callPackage, sdformat_6, ignition, ... } @ args:
callPackage ./. (args // {
version = "9.19.0";
srcHash = "sha256-HzykMIJLEgrgx8TAA3oaVue2v2xQcxsUi1x1v8Rtf+c=";
sdformat = sdformat_6;
ignition-common = ignition.common1;
ignition-transport = ignition.transport4;
ignition-msgs = ignition.msgs1;
ignition-fuel-tools = ignition.fuel-tools1;
})

25
pkgs/gazebo/default.nix
View file

@ -1,4 +1,4 @@
{ lib, mkDerivation, fetchurl, fetchpatch, cmake, pkg-config, ronn, libGL
{ lib, mkDerivation, fetchurl, cmake, pkg-config, ronn, libGL
, openal, hdf5, curl, tinyxml, tinyxml-2, libtar, gts, libusb1, qtbase, gdal
, libuuid, graphviz, libsForQt5, freeimage, boost, protobuf, sdformat, tbb
, ogre1_9, ffmpeg, ignition, ignition-cmake ? ignition.cmake0
@ -20,29 +20,6 @@ mkDerivation rec {
hash = srcHash;
};
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 compatibility with QWT 6.2
lib.optional (lib.versionOlder version "9.20.0") (fetchpatch {
url = "https://github.com/osrf/gazebo/commit/2fc9018c17cf44e28548d571b70f7543c1e3a5f3.patch";
hash = "sha256-9BB9MQbDSvbA13TPfSZR5XmrFo2JIopaDkscqGZ/HNU=";
}) ++
# Fix compatibility with OpenAL v1.20.0
lib.optional (lib.versionOlder version "11.0.0") (fetchpatch {
url = "https://github.com/osrf/gazebo/commit/b4429a242c43e01c367bc02afa2c4a0e6b59dddd.patch";
hash = "sha256-Q2wj9VcGc+zBvMXztPLMroEnOskFHU6QtsU+kC+5rRA=";
}) ++
# Fix compatibility with Protobuf 3.20
lib.optional (lib.versionOlder version "9.20.0") (fetchpatch {
url = "https://github.com/osrf/gazebo/commit/f37fd3cc7d4d71835ce952c2bf3b068d2c409b37.patch";
hash = "sha256-3KOmhylw+6VNloamo1rQTcRXA+J5Y1niacQDW2VyzAo=";
});
enableParallelBuilding = true;
cmakeFlags = [ "-DUSE_HOST_CFLAGS=False" ];