From 71a4c24a33b1b4e33b46aca7757a85ca0735cab6 Mon Sep 17 00:00:00 2001 From: Ben Wolsieffer Date: Sun, 26 Nov 2023 15:48:43 -0500 Subject: [PATCH] gazebo: remove commented out patch --- pkgs/gazebo/default.nix | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/pkgs/gazebo/default.nix b/pkgs/gazebo/default.nix index ce652063eb..2817746056 100644 --- a/pkgs/gazebo/default.nix +++ b/pkgs/gazebo/default.nix @@ -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 @@ -17,12 +17,6 @@ mkDerivation rec { hash = "sha256-fphCwEbJ4HVTVbJ0wkCoq79Olivnznt/WRlOX0tYT0U="; }; - # Fix build with Protobuf >= 22 - # patches = [ (fetchpatch { - # url = "https://github.com/gazebosim/gazebo-classic/commit/17e09f574a4f39caff279cd70364cd1a3ea46f70.patch"; - # hash = "sha256-YrepsP3TOQsJaF+rIF4CmfEHSRfL2j9dqQCmd1UR2b8="; - # }) ]; - enableParallelBuilding = true; cmakeFlags = [ "-DUSE_HOST_CFLAGS=False" ];