From 4d66231066ac8f355ddd929b01a583f747324a06 Mon Sep 17 00:00:00 2001
From: Michal Sojka <michal.sojka@cvut.cz>
Date: Sat, 8 Apr 2023 20:13:21 +0200
Subject: [PATCH] rviz-ogre-vendor: Fix library path

    [ERROR] [1680979246.194354969] [rviz2]: InternalErrorException: Could not load dynamic library
    /nix/store/4r2h3xi49krwzwf64rpf2prsfg5mbjxv-ros-env/opt/rviz_ogre_vendor/lib/OGRE/RenderSystem_GL.
    System Error: /nix/store/4r2h3xi49krwzwf64rpf2prsfg5mbjxv-ros-env/opt/rviz_ogre_vendor/lib/OGRE/RenderSystem_GL.so.1.12.1:
    cannot open shared object file: No such file or directory in DynLib::load at
    /build/rviz-release-release-humble-rviz_ogre_vendor-11.2.5-1/build/ogre-v1.12.1-prefix/src/ogre-v1.12.1/OgreMain/src/OgreDynLib.cpp (line 113)
    terminate called after throwing an instance of 'Ogre::InternalErrorException'
      what():  InternalErrorException: Could not load dynamic library /nix/store/4r2h3xi49krwzwf64rpf2prsfg5mbjxv-ros-env/opt/rviz_ogre_vendor/lib/OGRE/RenderSystem_GL.  System Error: /nix/store/4r2h3xi49krwzwf64rpf2prsfg5mbjxv-ros-env/opt/rviz_ogre_vendor/lib/OGRE/RenderSystem_GL.so.1.12.1: cannot open shared object file: No such file or directory in DynLib::load at /build/rviz-release-release-humble-rviz_ogre_vendor-11.2.5-1/build/ogre-v1.12.1-prefix/src/ogre-v1.12.1/OgreMain/src/OgreDynLib.cpp (line 113)
    Aborted (core dumped)
---
 distros/ros2-overlay.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/distros/ros2-overlay.nix b/distros/ros2-overlay.nix
index c26d26a930..39ed453edf 100644
--- a/distros/ros2-overlay.nix
+++ b/distros/ros2-overlay.nix
@@ -153,6 +153,11 @@ rosSelf: rosSuper: with rosSelf.lib; {
     '';
   });
 
+  rviz-ogre-vendor = rosSuper.rviz-ogre-vendor.overrideAttrs ({ ... }: {
+    # Prevent replacing $out/opt/.. with $out/var/empty/..
+    dontFixCmake = true;
+  });
+
   rviz2 = rosSuper.rviz2.overrideAttrs ({
     nativeBuildInputs ? [], postFixup ? "", ...
   }: {