diff --git a/distros/melodic/overrides.nix b/distros/melodic/overrides.nix index 1902602931..a060d6ca5c 100644 --- a/distros/melodic/overrides.nix +++ b/distros/melodic/overrides.nix @@ -108,16 +108,4 @@ rosSelf: rosSuper: with rosSelf.lib; { url = "https://github.com/fmtlib/fmt/releases/download/6.0.0/fmt-6.0.0.zip"; sha256 = "0h148anbaqgch6n69pxsvs1c9wmykgd052wmzgdia7qpz8w6p8dl"; }; - - rqt-gui = rosSuper.rqt-gui.overrideAttrs ({ - patches ? [], ... - }: { - # Fix usage of removed ElementTree.getiterator() method - # https://github.com/ros-visualization/rqt/pull/241 - patches = patches ++ [ (self.fetchpatch { - url = "https://github.com/ros-visualization/rqt/commit/aaf8da523b32307ad906e48fa977eff1779b0154.patch"; - stripLen = 1; - sha256 = "1p2rh2l74plq5aa319mxgi0hqm2if0qk3mr5fz8zif1zpgz4wvh3"; - }) ]; - }); } diff --git a/distros/noetic/overrides.nix b/distros/noetic/overrides.nix index 028169f986..6dedcfe8f2 100644 --- a/distros/noetic/overrides.nix +++ b/distros/noetic/overrides.nix @@ -36,14 +36,6 @@ rosSelf: rosSuper: with rosSelf.lib; { rqt-gui = rosSuper.rqt-gui.overrideAttrs ({ patches ? [], postFixup ? "", ... }: { - # Fix usage of removed ElementTree.getiterator() method - # https://github.com/ros-visualization/rqt/pull/241 - patches = patches ++ [ (self.fetchpatch { - url = "https://github.com/ros-visualization/rqt/commit/aaf8da523b32307ad906e48fa977eff1779b0154.patch"; - stripLen = 1; - sha256 = "1p2rh2l74plq5aa319mxgi0hqm2if0qk3mr5fz8zif1zpgz4wvh3"; - }) ]; - postFixup = postFixup + '' wrapQtApp "$out/lib/rqt_gui/rqt_gui" '';