From cff954f0c3b689679c361b3000e1058c882d8e1e Mon Sep 17 00:00:00 2001
From: Nikolay Korotkiy <sikmir@disroot.org>
Date: Wed, 1 Oct 2025 00:24:07 +0400
Subject: [PATCH] merkaartor: update to qt6

---
 pkgs/by-name/me/merkaartor/package.nix | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/pkgs/by-name/me/merkaartor/package.nix b/pkgs/by-name/me/merkaartor/package.nix
index c206410dfddf..f34100339455 100644
--- a/pkgs/by-name/me/merkaartor/package.nix
+++ b/pkgs/by-name/me/merkaartor/package.nix
@@ -7,7 +7,7 @@
   gdal,
   proj,
   protobuf,
-  qt5,
+  qt6,
   withGeoimage ? true,
   exiv2,
   withGpsdlib ? (!stdenv.hostPlatform.isDarwin),
@@ -25,24 +25,25 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "openstreetmap";
     repo = "merkaartor";
-    rev = version;
+    tag = version;
     hash = "sha256-oxLGhIE1qJ9+GOztD1HvrLGRGVO3gyy7Rc6CyzKTFec=";
   };
 
   nativeBuildInputs = [
     cmake
     pkg-config
-    qt5.qttools
-    qt5.wrapQtAppsHook
+    qt6.qttools
+    qt6.wrapQtAppsHook
   ];
 
   buildInputs = [
     gdal
     proj
     protobuf
-    qt5.qtnetworkauth
-    qt5.qtsvg
-    qt5.qtwebengine
+    qt6.qt5compat
+    qt6.qtnetworkauth
+    qt6.qtsvg
+    qt6.qtwebengine
   ]
   ++ lib.optional withGeoimage exiv2
   ++ lib.optional withGpsdlib gpsd