Merge commit '83cbad92d73216bb0d9187c56cce0b91f9121d5a' into main

1 files changed, 12 insertions, 3 deletions

diff --git a/infra/libkookie/nixpkgs/pkgs/applications/video/mapmap/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/video/mapmap/default.nix
index 9d6ffbd439c4..7320deaf4ce4 100644
--- a/infra/libkookie/nixpkgs/pkgs/applications/video/mapmap/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/applications/video/mapmap/default.nix
@@ -1,11 +1,13 @@
-{ stdenv 
+{ stdenv
 , fetchFromGitHub
+, fetchpatch
 , qttools
 , qtmultimedia
 , liblo
 , gst_all_1
 , qmake
 , pkgconfig
+, wrapQtAppsHook
 }:
 
 with stdenv;
@@ -25,6 +27,7 @@ mkDerivation rec {
   nativeBuildInputs = [
     qmake
     pkgconfig
+    wrapQtAppsHook
   ];
 
   buildInputs = [
@@ -37,6 +40,14 @@ mkDerivation rec {
     gst_all_1.gst-vaapi
   ];
 
+  patches = [
+    (fetchpatch {
+      name = "message-handler-segfault.patch";
+      url = "https://github.com/mapmapteam/mapmap/pull/519/commits/22eeee59ba7de6de7b73ecec3b0ea93bdc7f04e8.patch";
+      sha256 = "0is905a4lf9vvl5b1n4ky6shrnbs5kz9mlwfk78hrl4zabfmcl5l";
+    })
+  ];
+
   installPhase = ''
     mkdir -p $out/bin
     cp mapmap $out/bin/mapmap
@@ -57,8 +68,6 @@ mkDerivation rec {
     license = licenses.gpl3;
     maintainers = [ maintainers.erictapen ];
     platforms = platforms.linux;
-    # binary segfaults at the moment
-    broken = true;
   };
 
 }