diff --git a/distros/melodic/overrides.nix b/distros/melodic/overrides.nix
index 4bf8847b22..da77faee4b 100644
--- a/distros/melodic/overrides.nix
+++ b/distros/melodic/overrides.nix
@@ -16,6 +16,24 @@ rosSelf: rosSuper: with rosSelf.lib; {
 
   gazebo = self.gazebo_9;
 
+  geometric-shapes = rosSuper.geometric-shapes.overrideAttrs ({
+    patches ? [], ...
+  }: {
+    patches = patches ++ [
+      # Revert formatting changes that cause conflict with next patch
+      (self.fetchpatch {
+        url = "https://github.com/ros-planning/geometric_shapes/commit/12afa837202dcc6c96f96fc499ef25078f997b75.patch";
+        sha256 = "069yj33jj74i6ka98y4m8pwn64dl9bgmiapkmlwvyk5as2w9ndvx";
+        revert = true;
+      })
+      # Fix build with latest QHull
+      (self.fetchpatch {
+        url = "https://github.com/ros-planning/geometric_shapes/commit/22e5a02a06c36bfc0c49ce5cc636e7ab64d8b0be.patch";
+        sha256 = "015min5qdi8vkvbjbcvyrf41ycd2nk2d371x1jb0xpn30r8nhlin";
+      })
+    ];
+  });
+
   pcl-ros = rosSuper.pcl-ros.overrideAttrs ({
     patches ? [], ...
   }: {