diff --git a/crystal/overrides.nix b/crystal/overrides.nix
index e84a12b13f..56b44cc5fe 100644
--- a/crystal/overrides.nix
+++ b/crystal/overrides.nix
@@ -1,5 +1,9 @@
 # Top level package set
 self:
 # Distro package set
-rosSelf: rosSuper: {
+rosSelf: rosSuper: with rosSelf.lib; {
+  rviz-ogre-vendor = patchVendorUrl rosSuper.rviz-ogre-vendor {
+    url = "https://github.com/OGRECave/ogre/archive/v1.10.11.zip";
+    sha256 = "0906sk8k2yz47mbcymm5s06knhhywgffvf2lzfnc8rbqhn2sc51d";
+  };
 }
diff --git a/dashing/overrides.nix b/dashing/overrides.nix
index 08aea4c6c4..25cb75f21f 100644
--- a/dashing/overrides.nix
+++ b/dashing/overrides.nix
@@ -42,4 +42,9 @@ rosSelf: rosSuper: with rosSelf.lib; {
       })
     ];
   });
+
+  rviz-ogre-vendor = patchVendorUrl rosSuper.rviz-ogre-vendor {
+    url = "https://github.com/OGRECave/ogre/archive/v1.10.12.zip";
+    sha256 = "1nafqazv396y97z0rgrn0dmkddq7y4zgfszvmi3aw6hr6zwyrpa3";
+  };
 }
diff --git a/distro-overlay.nix b/distro-overlay.nix
index 8752fb92c9..e5af2ef305 100644
--- a/distro-overlay.nix
+++ b/distro-overlay.nix
@@ -168,10 +168,7 @@ let
       '' + postFixup;
     });
 
-    rviz-ogre-vendor = (patchVendorUrl rosSuper.rviz-ogre-vendor {
-      url = "https://github.com/OGRECave/ogre/archive/v1.10.12.zip";
-      sha256 = "1nafqazv396y97z0rgrn0dmkddq7y4zgfszvmi3aw6hr6zwyrpa3";
-    }).overrideAttrs ({
+    rviz-ogre-vendor = rosSuper.rviz-ogre-vendor.overrideAttrs ({
       preFixup ? "", ...
     }: {
       dontFixCmake = true;
diff --git a/melodic/overrides.nix b/melodic/overrides.nix
index 446a946fe2..42fa3ec5a7 100644
--- a/melodic/overrides.nix
+++ b/melodic/overrides.nix
@@ -1,7 +1,7 @@
 # Top level package set
 self:
 # Distro package set
-rosSelf: rosSuper: {
+rosSelf: rosSuper: with rosSelf.lib; {
   amcl = rosSuper.amcl.overrideAttrs ({
     patches ? [], ...
   }: {