From e08f54959964c966b027dbec84dd6e37070988b0 Mon Sep 17 00:00:00 2001
From: Hunter Jones <hjones2199@gmail.com>
Date: Mon, 4 Oct 2021 14:33:44 -0500
Subject: marble: fix build with gpsd 3.23.1

---
 pkgs/applications/kde/marble.nix | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

(limited to 'pkgs/applications/kde')

diff --git a/pkgs/applications/kde/marble.nix b/pkgs/applications/kde/marble.nix
index 7fe3aa529fa2..637ae3bc977e 100644
--- a/pkgs/applications/kde/marble.nix
+++ b/pkgs/applications/kde/marble.nix
@@ -2,7 +2,7 @@
 , extra-cmake-modules, kdoctools
 , qtscript, qtsvg, qtquickcontrols, qtwebengine
 , krunner, shared-mime-info, kparts, knewstuff
-, gpsd, perl
+, gpsd, perl, fetchpatch
 }:
 
 mkDerivation {
@@ -18,6 +18,15 @@ mkDerivation {
     qtscript qtsvg qtquickcontrols qtwebengine shared-mime-info krunner kparts
     knewstuff gpsd
   ];
+  patches = [
+    (fetchpatch {
+      # Backport fix to allow compilation with gpsd 3.23.1
+      # Remove when marble compiles without the patch.
+      # See: https://invent.kde.org/education/marble/-/merge_requests/57
+      url = "https://invent.kde.org/education/marble/-/commit/8aadc3eb8f9484a65d497d442cd8c61fe1462bef.diff";
+      sha256 = "sha256-ZkPXyunVItSRctv6SLGIonvyZwLDhCz+wfJrIXeHcDo=";
+    })
+  ];
   preConfigure = ''
     cmakeFlags+=" -DINCLUDE_INSTALL_DIR=''${!outputDev}/include"
   '';
-- 
cgit 1.4.1