git.iko.soy/typeable/nixpkgs
on master help sign in
marble: fix build with gpsd 3.23.1
commite08f54959964c966b027dbec84dd6e37070988b0 authorHunter Jones <hjones2199@gmail.com> dateMon 4 Oct 2021, 14:33 (5 years ago) parent0699530
1 file changed+10−1
pkgs/applications/kde/marble.nix+10−1
pkgs/applications/kde/marble.nix+10−1
@@ -2,7 +2,7 @@
22, extra-cmake-modules, kdoctools
33, qtscript, qtsvg, qtquickcontrols, qtwebengine
44, krunner, shared-mime-info, kparts, knewstuff
5−, gpsd, perl
5+, gpsd, perl, fetchpatch
66}:
77
88mkDerivation {
@@ -18,6 +18,15 @@ mkDerivation {
1818 qtscript qtsvg qtquickcontrols qtwebengine shared-mime-info krunner kparts
1919 knewstuff gpsd
2020 ];
21+ patches = [
22+ (fetchpatch {
23+ # Backport fix to allow compilation with gpsd 3.23.1
24+ # Remove when marble compiles without the patch.
25+ # See: https://invent.kde.org/education/marble/-/merge_requests/57
26+ url = "https://invent.kde.org/education/marble/-/commit/8aadc3eb8f9484a65d497d442cd8c61fe1462bef.diff";
27+ sha256 = "sha256-ZkPXyunVItSRctv6SLGIonvyZwLDhCz+wfJrIXeHcDo=";
28+ })
29+ ];
2130 preConfigure = ''
2231 cmakeFlags+=" -DINCLUDE_INSTALL_DIR=''${!outputDev}/include"
2332 '';