git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #140523 from hjones2199/gpsd-fixes
commit9e016672b17fb167f8cb8c6e854bfa6109b3c6ba authorSandro <sandro.jaeckel@gmail.com> dateWed 6 Oct 2021, 23:57 (5 years ago) parent68f25d57ad2a73
2 files changed+24−7
compare with master
unifiedsplit
pkgs/applications/kde/marble.nix+10−1 pkgs/applications/misc/foxtrotgps/default.nix+14−6
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 '';
pkgs/applications/misc/foxtrotgps/default.nix+14−6
@@ -6,8 +6,8 @@ let
66 srcs = {
77 foxtrot = fetchbzr {
88 url = "lp:foxtrotgps";
9− rev = "329";
10− sha256 = "0fwgnsrah63h1xdgm5xdi5ancrz89shdp5sdzw1qc1m7i9a03rid";
9+ rev = "331";
10+ sha256 = "sha256-/kJv6a3MzAzzwIl98Mqi7jrUJC1kDvouigf9kGtv868=";
1111 };
1212 screenshots = fetchbzr {
1313 url = "lp:foxtrotgps/screenshots";
@@ -17,7 +17,7 @@ let
1717 };
1818in stdenv.mkDerivation rec {
1919 pname = "foxtrotgps";
20− version = "1.2.2+329";
20+ version = "1.2.2+331";
2121
2222 # Pull directly from bzr because gpsd API version 9 is not supported on latest release
2323 src = srcs.foxtrot;
@@ -39,12 +39,20 @@ in stdenv.mkDerivation rec {
3939 ];
4040
4141 postUnpack = ''
42− cp -R ${srcs.screenshots} $sourceRoot/doc/screenshots
43− chmod -R u+w $sourceRoot/doc/screenshots
42+ cp -R ${srcs.screenshots} $sourceRoot/doc/screenshots
43+ chmod -R u+w $sourceRoot/doc/screenshots
44+ '';
45+
46+ # Remove when foxtrotgps supports gpsd 3.23.1
47+ # Patch for compatibility with gpsd 3.23.1. This was added for foxtrotgps
48+ # 1.2.2+331. The command can be removed if the build of a newer version
49+ # succeeds without it.
50+ postPatch = ''
51+ substituteInPlace src/gps_functions.c --replace "STATUS_NO_FIX" "STATUS_UNK"
4452 '';
4553
4654 preConfigure = ''
47− intltoolize --automake --copy --force
55+ intltoolize --automake --copy --force
4856 '';
4957
5058 meta = with lib; {