From 3bd85fa720ceb2f1f0204e5b0410831f4b9f9254 Mon Sep 17 00:00:00 2001 From: Vladimír Čunát Date: Tue, 19 Oct 2021 08:33:13 +0200 Subject: Revert "marble: fix build with gpsd 3.23.1" The patch is already included in the current source. It's PR #140523 adding the patch and PR #141127 updating KDE apps; they missed each other (different target branches, different files). This reverts commit e08f54959964c966b027dbec84dd6e37070988b0. --- pkgs/applications/kde/marble.nix | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) (limited to 'pkgs') diff --git a/pkgs/applications/kde/marble.nix b/pkgs/applications/kde/marble.nix index 637ae3bc977e3..7fe3aa529fa24 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, fetchpatch +, gpsd, perl }: mkDerivation { @@ -18,15 +18,6 @@ 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