diff options
| author | Hunter Jones <hjones2199@gmail.com> | 2021-10-04 14:33:44 -0500 |
|---|---|---|
| committer | Hunter Jones <hjones2199@gmail.com> | 2021-10-05 18:20:44 -0500 |
| commit | e08f54959964c966b027dbec84dd6e37070988b0 (patch) | |
| tree | c20a4c647abb93fd64d3eef2e2ec036b540e9539 /pkgs/applications/kde | |
| parent | 0699530f08290f34c532beedd66046825d9756fa (diff) | |
| download | nixpkgs-e08f54959964c966b027dbec84dd6e37070988b0.tar nixpkgs-e08f54959964c966b027dbec84dd6e37070988b0.tar.gz nixpkgs-e08f54959964c966b027dbec84dd6e37070988b0.tar.bz2 nixpkgs-e08f54959964c966b027dbec84dd6e37070988b0.tar.lz nixpkgs-e08f54959964c966b027dbec84dd6e37070988b0.tar.xz nixpkgs-e08f54959964c966b027dbec84dd6e37070988b0.tar.zst nixpkgs-e08f54959964c966b027dbec84dd6e37070988b0.zip | |
marble: fix build with gpsd 3.23.1
Diffstat (limited to 'pkgs/applications/kde')
| -rw-r--r-- | pkgs/applications/kde/marble.nix | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/pkgs/applications/kde/marble.nix b/pkgs/applications/kde/marble.nix index 7fe3aa529fa..637ae3bc977 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" ''; |