summary refs log tree commit diff
path: root/pkgs/applications/misc/foxtrotgps
diff options
context:
space:
mode:
authorHunter Jones <hjones2199@gmail.com>2021-10-04 14:48:41 -0500
committerHunter Jones <hjones2199@gmail.com>2021-10-05 18:20:44 -0500
commit7ad2a73cb286223c2f5116f2a728f42aa0467c98 (patch)
treec462bcc2ed749c721a588129e3f6daa13629d1bf /pkgs/applications/misc/foxtrotgps
parente08f54959964c966b027dbec84dd6e37070988b0 (diff)
downloadnixpkgs-7ad2a73cb286223c2f5116f2a728f42aa0467c98.tar
nixpkgs-7ad2a73cb286223c2f5116f2a728f42aa0467c98.tar.gz
nixpkgs-7ad2a73cb286223c2f5116f2a728f42aa0467c98.tar.bz2
nixpkgs-7ad2a73cb286223c2f5116f2a728f42aa0467c98.tar.lz
nixpkgs-7ad2a73cb286223c2f5116f2a728f42aa0467c98.tar.xz
nixpkgs-7ad2a73cb286223c2f5116f2a728f42aa0467c98.tar.zst
nixpkgs-7ad2a73cb286223c2f5116f2a728f42aa0467c98.zip
foxtrotgps: 1.2.2+329 -> 1.2.2+331
Diffstat (limited to 'pkgs/applications/misc/foxtrotgps')
-rw-r--r--pkgs/applications/misc/foxtrotgps/default.nix20
1 files changed, 14 insertions, 6 deletions
diff --git a/pkgs/applications/misc/foxtrotgps/default.nix b/pkgs/applications/misc/foxtrotgps/default.nix
index 8692ac98933..745a2357e23 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 = "329";
-      sha256 = "0fwgnsrah63h1xdgm5xdi5ancrz89shdp5sdzw1qc1m7i9a03rid";
+      rev = "331";
+      sha256 = "sha256-/kJv6a3MzAzzwIl98Mqi7jrUJC1kDvouigf9kGtv868=";
     };
     screenshots = fetchbzr {
       url = "lp:foxtrotgps/screenshots";
@@ -17,7 +17,7 @@ let
   };
 in stdenv.mkDerivation rec {
   pname = "foxtrotgps";
-  version = "1.2.2+329";
+  version = "1.2.2+331";
 
   # Pull directly from bzr because gpsd API version 9 is not supported on latest release
   src = srcs.foxtrot;
@@ -39,12 +39,20 @@ in stdenv.mkDerivation rec {
   ];
 
   postUnpack = ''
-  cp -R ${srcs.screenshots} $sourceRoot/doc/screenshots
-  chmod -R u+w $sourceRoot/doc/screenshots
+    cp -R ${srcs.screenshots} $sourceRoot/doc/screenshots
+    chmod -R u+w $sourceRoot/doc/screenshots
+  '';
+
+  # Remove when foxtrotgps supports gpsd 3.23.1
+  # Patch for compatibility with gpsd 3.23.1. This was added for foxtrotgps
+  # 1.2.2+331. The command can be removed if the build of a newer version
+  # succeeds without it.
+  postPatch = ''
+    substituteInPlace src/gps_functions.c --replace "STATUS_NO_FIX" "STATUS_UNK"
   '';
 
   preConfigure = ''
-  intltoolize --automake --copy --force
+    intltoolize --automake --copy --force
   '';
 
   meta = with lib; {