From 06ae99533a0be337e7df3f2da32578a19224f2b3 Mon Sep 17 00:00:00 2001 From: K900 Date: Thu, 10 Apr 2025 22:05:46 +0300 Subject: [PATCH] kdePackages.marble: fix build with Qt 6.9 --- pkgs/kde/gear/marble/default.nix | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/pkgs/kde/gear/marble/default.nix b/pkgs/kde/gear/marble/default.nix index 9c3723815d51..699a663b280a 100644 --- a/pkgs/kde/gear/marble/default.nix +++ b/pkgs/kde/gear/marble/default.nix @@ -17,10 +17,24 @@ gpsd, protobuf, shapelib, + fetchpatch, }: mkKdeDerivation { pname = "marble"; + # Fix build with Qt 6.9 + # FIXME: remove in 25.04 + patches = [ + (fetchpatch { + url = "https://invent.kde.org/education/marble/-/commit/8d21b43f569adcd3bb76d3f9d921f2aaddb2c303.patch"; + hash = "sha256-UdY/4yxRMHcLb76A3elOLIEH+4v+AgVeUbUKzdavXHA="; + }) + (fetchpatch { + url = "https://invent.kde.org/education/marble/-/commit/a14a3a911f5a8f152783a97410267a6fd98cce48.patch"; + hash = "sha256-WY28+Ea7DQ3qkNed25EtCtAKlM3Y/57gyM/DHQqdfCc="; + }) + ]; + extraNativeBuildInputs = [ perl pkg-config