From 594a64635d3c700481e74981ff497e504c47508a Mon Sep 17 00:00:00 2001
From: Ben Wolsieffer <benwolsieffer@gmail.com>
Date: Wed, 30 Mar 2022 16:28:34 -0400
Subject: [PATCH] Fix mapviz build with CMake 3.22

---
 distros/distro-overlay.nix | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/distros/distro-overlay.nix b/distros/distro-overlay.nix
index 0383fbaa82..cc9b80e844 100644
--- a/distros/distro-overlay.nix
+++ b/distros/distro-overlay.nix
@@ -223,9 +223,17 @@ let
     });
 
     mapviz = rosSuper.mapviz.overrideAttrs ({
+      patches ? [],
       nativeBuildInputs ? [],
       postFixup ? "", ...
     }: {
+      # Fix linking to GLUT with CMake 3.22
+      patches = patches ++ [ (self.fetchpatch {
+        url = "https://github.com/swri-robotics/mapviz/commit/b3c8e19bc1b7e1d2478c0b13a848d7caf40b4e5e.patch";
+        sha256 = "sha256-abjP9Pn3v+aLZBOI0KiGihHgt2WLadDvdaKVyk2IlPY=";
+        stripLen = 1;
+      }) ];
+
       dontWrapQtApps = false;
       nativeBuildInputs = nativeBuildInputs ++ [ self.qt5.wrapQtAppsHook ];
       postFixup = postFixup + ''