Skip to content

Commit

Permalink
Revert "gazebo: use Ogre 1.12"
Browse files Browse the repository at this point in the history
This reverts commit 6178a8c.

Apparently, 1.10 works correctly, but I haven't tested.
  • Loading branch information
lopsided98 committed Mar 3, 2022

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
1 parent d28a39d commit a405f62
Showing 2 changed files with 3 additions and 4 deletions.
3 changes: 1 addition & 2 deletions pkgs/gazebo/9.nix
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
{ callPackage, sdformat_6, ogre1_10, ignition, ... } @ args:
{ callPackage, sdformat_6, ignition, ... } @ args:

callPackage ./. (args // {
version = "9.18.0";
srcSha256 = "0j9458bzm7a3pl4nsialypw2s3p1fk3sjpji8kw8aqkrdrpdw03d";
sdformat = sdformat_6;
ogre = ogre1_10;
ignition-common = ignition.common1;
ignition-transport = ignition.transport4;
ignition-msgs = ignition.msgs1;
4 changes: 2 additions & 2 deletions pkgs/gazebo/default.nix
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{ lib, mkDerivation, fetchurl, fetchpatch, cmake, pkg-config, ronn, libGL
, openal, hdf5, curl, tinyxml, tinyxml-2, libtar, gts, libusb1, qtbase, gdal
, libuuid, graphviz, libsForQt5, freeimage, boost, protobuf, sdformat, tbb
, ogre, ffmpeg, ignition, ignition-cmake ? ignition.cmake0
, ogre1_10, ffmpeg, ignition, ignition-cmake ? ignition.cmake0
, ignition-common ? ignition.common, ignition-math ? ignition.math4
, ignition-transport ? ignition.transport8, ignition-msgs ? ignition.msgs
, ignition-fuel-tools ? ignition.fuel-tools4
@@ -70,7 +70,7 @@ mkDerivation rec {
protobuf
sdformat
tbb
ogre
ogre1_10
ffmpeg
ignition-math
ignition-transport

0 comments on commit a405f62

Please sign in to comment.