colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

foxtrotgps: 1.2.2+326 -> 1.2.2+329

Browse Source
This commit is contained in:
Hunter Jones 2021-03-08 22:35:53 -06:00
parent 29b0d4d0b6
commit 80c4edc58e
2 changed files with 7 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
pkgs/applications/misc/foxtrotgps/default.nix
View File

@ -6,8 +6,8 @@ let
srcs = { srcs = {
foxtrot = fetchbzr { foxtrot = fetchbzr {
url = "lp:foxtrotgps"; url = "lp:foxtrotgps";
rev = "326"; rev = "329";
sha256 = "191pgcy5rng8djy22a5z9s8gssc73f9p5hm4ig52ra189cb48d8k"; sha256 = "0fwgnsrah63h1xdgm5xdi5ancrz89shdp5sdzw1qc1m7i9a03rid";
}; };
screenshots = fetchbzr { screenshots = fetchbzr {
url = "lp:foxtrotgps/screenshots"; url = "lp:foxtrotgps/screenshots";
@ -17,23 +17,21 @@ let
}; };
in stdenv.mkDerivation rec { in stdenv.mkDerivation rec {
pname = "foxtrotgps"; pname = "foxtrotgps";
version = "1.2.2+326"; version = "1.2.2+329";
# Pull directly from bzr because gpsd API version 9 is not supported on latest release # Pull directly from bzr because gpsd API version 9 is not supported on latest release
src = srcs.foxtrot; src = srcs.foxtrot;
patches = [ nativeBuildInputs = [
./gps-status-fix.patch pkg-config autoreconfHook texinfo help2man
imagemagick wrapGAppsHook intltool
]; ];
nativeBuildInputs = [ pkg-config autoreconfHook texinfo help2man imagemagick wrapGAppsHook ];
buildInputs = [ buildInputs = [
curl.dev curl.dev
gnome2.libglade.dev gnome2.libglade.dev
gpsd gpsd
gtk2.dev gtk2.dev
intltool
libexif libexif
sqlite.dev sqlite.dev
(python3Packages.python.withPackages (pythonPackages: with python3Packages; (python3Packages.python.withPackages (pythonPackages: with python3Packages;
@ -58,7 +56,7 @@ in stdenv.mkDerivation rec {
innovation. innovation.
''; '';
homepage = "https://www.foxtrotgps.org/"; homepage = "https://www.foxtrotgps.org/";
license = licenses.gpl2; license = licenses.gpl2Plus;
platforms = platforms.unix; platforms = platforms.unix;
maintainers = with maintainers; [ wucke13 ]; maintainers = with maintainers; [ wucke13 ];
}; };

14
pkgs/applications/misc/foxtrotgps/gps-status-fix.patch
View File

@ -1,14 +0,0 @@
--- foxtrot/src/gps_functions.c.orig 2020-12-04 15:02:22.290163204 -0600
+++ foxtrot/src/gps_functions.c 2020-12-04 15:04:54.470648534 -0600
@@ -762,7 +762,11 @@
{
gpsdata->fix.time = (time_t) 0;
}
+#if GPSD_API_MAJOR_VERSION >= 9
+ gpsdata->valid = (libgps_gpsdata.fix.status != STATUS_NO_FIX);
+#else
gpsdata->valid = (libgps_gpsdata.status != STATUS_NO_FIX);
+#endif
if (gpsdata->valid)
{
gpsdata->seen_valid = TRUE;