git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #115478 from hjones2199/master
commiteda41ed95fc3b3a0c72c3f229388ba1c9fe09d82 authorSandro <sandro.jaeckel@gmail.com> dateTue 9 Mar 2021, 09:37 (6 years ago) parenta50d9e980c4edc
2 files changed+7−23
pkgs/applications/misc/foxtrotgps/default.nix+7−9 pkgs/applications/misc/foxtrotgps/gps-status-fix.patch−14
pkgs/applications/misc/foxtrotgps/default.nix+7−9
@@ -6,8 +6,8 @@ let
66 srcs = {
77 foxtrot = fetchbzr {
88 url = "lp:foxtrotgps";
9− rev = "326";
10− sha256 = "191pgcy5rng8djy22a5z9s8gssc73f9p5hm4ig52ra189cb48d8k";
9+ rev = "329";
10+ sha256 = "0fwgnsrah63h1xdgm5xdi5ancrz89shdp5sdzw1qc1m7i9a03rid";
1111 };
1212 screenshots = fetchbzr {
1313 url = "lp:foxtrotgps/screenshots";
@@ -17,23 +17,21 @@ let
1717 };
1818in stdenv.mkDerivation rec {
1919 pname = "foxtrotgps";
20− version = "1.2.2+326";
20+ version = "1.2.2+329";
2121
2222 # Pull directly from bzr because gpsd API version 9 is not supported on latest release
2323 src = srcs.foxtrot;
2424
25− patches = [
26− ./gps-status-fix.patch
25+ nativeBuildInputs = [
26+ pkg-config autoreconfHook texinfo help2man
27+ imagemagick wrapGAppsHook intltool
2728 ];
2829
29− nativeBuildInputs = [ pkg-config autoreconfHook texinfo help2man imagemagick wrapGAppsHook ];
30−
3130 buildInputs = [
3231 curl.dev
3332 gnome2.libglade.dev
3433 gpsd
3534 gtk2.dev
36− intltool
3735 libexif
3836 sqlite.dev
3937 (python3Packages.python.withPackages (pythonPackages: with python3Packages;
@@ -58,7 +56,7 @@ in stdenv.mkDerivation rec {
5856 innovation.
5957 '';
6058 homepage = "https://www.foxtrotgps.org/";
61− license = licenses.gpl2;
59+ license = licenses.gpl2Plus;
6260 platforms = platforms.unix;
6361 maintainers = with maintainers; [ wucke13 ];
6462 };
pkgs/applications/misc/foxtrotgps/gps-status-fix.patchdeleted−14
@@ -1,14 +0,0 @@
1−--- foxtrot/src/gps_functions.c.orig 2020-12-04 15:02:22.290163204 -0600
2−+++ foxtrot/src/gps_functions.c 2020-12-04 15:04:54.470648534 -0600
3−@@ -762,7 +762,11 @@
4− {
5− gpsdata->fix.time = (time_t) 0;
6− }
7−+#if GPSD_API_MAJOR_VERSION >= 9
8−+ gpsdata->valid = (libgps_gpsdata.fix.status != STATUS_NO_FIX);
9−+#else
10− gpsdata->valid = (libgps_gpsdata.status != STATUS_NO_FIX);
11−+#endif
12− if (gpsdata->valid)
13− {
14− gpsdata->seen_valid = TRUE;