diff --git a/pkgs/applications/misc/foxtrotgps/default.nix b/pkgs/applications/misc/foxtrotgps/default.nix index 5d0f07492a1..8692ac98933 100644 --- a/pkgs/applications/misc/foxtrotgps/default.nix +++ b/pkgs/applications/misc/foxtrotgps/default.nix @@ -6,8 +6,8 @@ let srcs = { foxtrot = fetchbzr { url = "lp:foxtrotgps"; - rev = "326"; - sha256 = "191pgcy5rng8djy22a5z9s8gssc73f9p5hm4ig52ra189cb48d8k"; + rev = "329"; + sha256 = "0fwgnsrah63h1xdgm5xdi5ancrz89shdp5sdzw1qc1m7i9a03rid"; }; screenshots = fetchbzr { url = "lp:foxtrotgps/screenshots"; @@ -17,23 +17,21 @@ let }; in stdenv.mkDerivation rec { 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 src = srcs.foxtrot; - patches = [ - ./gps-status-fix.patch + nativeBuildInputs = [ + pkg-config autoreconfHook texinfo help2man + imagemagick wrapGAppsHook intltool ]; - nativeBuildInputs = [ pkg-config autoreconfHook texinfo help2man imagemagick wrapGAppsHook ]; - buildInputs = [ curl.dev gnome2.libglade.dev gpsd gtk2.dev - intltool libexif sqlite.dev (python3Packages.python.withPackages (pythonPackages: with python3Packages; @@ -58,7 +56,7 @@ in stdenv.mkDerivation rec { innovation. ''; homepage = "https://www.foxtrotgps.org/"; - license = licenses.gpl2; + license = licenses.gpl2Plus; platforms = platforms.unix; maintainers = with maintainers; [ wucke13 ]; }; diff --git a/pkgs/applications/misc/foxtrotgps/gps-status-fix.patch b/pkgs/applications/misc/foxtrotgps/gps-status-fix.patch deleted file mode 100644 index e9b3624a174..00000000000 --- a/pkgs/applications/misc/foxtrotgps/gps-status-fix.patch +++ /dev/null @@ -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;