From d28c93eaa5ff204debd73bef6669539aa12f678b Mon Sep 17 00:00:00 2001 From: Xiangyan Sun Date: Fri, 17 Apr 2026 01:04:34 -0700 Subject: [PATCH] libsForQt5.maplibre-native-qt: fix build with gcc15 --- .../libraries/maplibre-native-qt/default.nix | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/pkgs/development/libraries/maplibre-native-qt/default.nix b/pkgs/development/libraries/maplibre-native-qt/default.nix index 3784356e6a2a..76f30c3acc21 100644 --- a/pkgs/development/libraries/maplibre-native-qt/default.nix +++ b/pkgs/development/libraries/maplibre-native-qt/default.nix @@ -1,6 +1,7 @@ { cmake, fetchFromGitHub, + fetchpatch, lib, qtlocation, stdenv, @@ -18,6 +19,16 @@ stdenv.mkDerivation (finalAttrs: { fetchSubmodules = true; }; + patches = [ + # fix build with gcc15 + (fetchpatch { + url = "https://github.com/maplibre/maplibre-native/commit/dde3fdd398a5f7b49300b1a761057bdd3286ae24.patch"; + hash = "sha256-UQ4Y2aoBsHQHEqlrwn4OUzICeT3MNVZlHFK/KphvV/c="; + stripLen = 1; + extraPrefix = "vendor/maplibre-native/"; + }) + ]; + postPatch = lib.optionals (lib.versionAtLeast qtlocation.version "6.10") '' # fix build with Qt 6.10 # included in https://github.com/maplibre/maplibre-native-qt/pull/216