Merge pull request #78436 from wucke13/foxtrotgps

foxtrotgps: init at 1.2.2

4 files changed, 43 insertions, 50 deletions

diff --git a/pkgs/applications/misc/foxtrotgps/default.nix b/pkgs/applications/misc/foxtrotgps/default.nix
new file mode 100644
index 00000000000..dc3f1922c21
--- /dev/null
+++ b/pkgs/applications/misc/foxtrotgps/default.nix
@@ -0,0 +1,40 @@
+{ fetchurl, stdenv, pkg-config, wrapGAppsHook, curl, gnome2, gpsd, gtk2
+, intltool, libexif, python3Packages, sqlite }:
+
+stdenv.mkDerivation rec {
+  pname = "foxtrotgps";
+  version = "1.2.2";
+
+  src = fetchurl {
+    url = "https://www.foxtrotgps.org/releases/foxtrotgps-${version}.tar.xz";
+    sha256 = "0grn35j5kwc286dxx18fv32qa330xmalqliwy6zirxmj6dffvrkg";
+  };
+
+  nativeBuildInputs = [ pkg-config wrapGAppsHook ];
+
+  buildInputs = [
+    curl.dev
+    gnome2.libglade.dev
+    gpsd
+    gtk2.dev
+    intltool
+    libexif
+    sqlite.dev
+    (python3Packages.python.withPackages (pythonPackages: with python3Packages;
+    [ beautifulsoup4 feedparser sqlalchemy ]))
+    ];
+
+  meta = with stdenv.lib; {
+    description = "GPS/GIS application optimized for small screens";
+    longDescription = ''
+      An easy to use, free & open-source GPS/GIS application that works well on
+      small screens, and is especially suited to touch input. It spun off of
+      tangoGPS in 2010 with a focus on cooperation and fostering community
+      innovation.
+    '';
+    homepage = "https://www.foxtrotgps.org/";
+    license = licenses.gpl2;
+    platforms = platforms.unix;
+    maintainers = with maintainers; [ wucke13 ];
+  };
+}
diff --git a/pkgs/applications/misc/tangogps/default.nix b/pkgs/applications/misc/tangogps/default.nix
deleted file mode 100644
index 10b487828ea..00000000000
--- a/pkgs/applications/misc/tangogps/default.nix
+++ /dev/null
@@ -1,46 +0,0 @@
-{ fetchurl, stdenv, pkgconfig, gettext, gtk2, gconf
-, curl, libexif, sqlite, libxml2 }:
-
-stdenv.mkDerivation rec {
-  name = "tangogps-0.99.2";
-
-  src = fetchurl {
-    url = "http://www.tangogps.org/downloads/${name}.tar.gz";
-    sha256 = "15q2kkrv4mfsivfdzjgpxr7s2amw7d501q2ayjl3ff4vmvfn5516";
-  };
-
-  nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ gettext gtk2 gconf curl libexif sqlite libxml2 ];
-  NIX_LDFLAGS = "-lm";
-
-  # bogus includes fail with newer library version
-  postPatch = ''
-    sed -i -e 's,#include <glib/.*>,#include <glib.h>,g' src/*.c
-    sed -i -e 's,#include <curl/.*>,#include <curl/curl.h>,g' src/*.c src/*.h
-  '';
-
-  meta = {
-    description = "User friendly map and GPS user interface";
-
-    longDescription = ''
-      tangoGPS is an easy to use, fast and lightweight mapping
-      application for use with or without GPS.
-
-      It runs on any Linux platform from the desktop over eeePC down
-      to phones like the Openmoko Neo.
-
-      By default tangoGPS uses map data from the OpenStreetMap
-      project.  Additionally a variety of other repositories can be
-      easily added.
-
-      The maps are automagically downloaded and cached for offline use
-      while you drag or zoom the map.  Furthermore you can
-      conveniently pre-cache areas with tangoGPS.
-    '';
-
-    #homepage = http://www.tangogps.org/; # no longer valid, I couldn't find any other
-
-    license = stdenv.lib.licenses.gpl2Plus;
-    platforms = stdenv.lib.platforms.unix;
-  };
-}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 2e94b0167b8..771e39f5635 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -412,6 +412,7 @@ mapAliases ({
   system_config_printer = system-config-printer;  # added 2016-01-03
   systool = sysfsutils; # added 2018-04-25
   tahoelafs = tahoe-lafs; # added 2018-03-26
+  tangogps = foxtrotgps; # added 2020-01-26
   telepathy_farstream = telepathy-farstream; # added 2018-02-25
   telepathy_gabble = telepathy-gabble; # added 2018-02-25
   telepathy_glib = telepathy-glib; # added 2018-02-25
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 25a12c53257..3336d19ed26 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -19230,6 +19230,8 @@ in
 
   formatter = callPackage ../applications/misc/formatter { };
 
+  foxtrotgps = callPackage ../applications/misc/foxtrotgps { };
+
   fractal = callPackage ../applications/networking/instant-messengers/fractal { };
 
   freecad = qt5.callPackage ../applications/graphics/freecad { mpi = openmpi; };
@@ -21657,10 +21659,6 @@ in
     inherit (darwin.apple_sdk.frameworks) Security;
   };
 
-  tangogps = callPackage ../applications/misc/tangogps {
-    gconf = gnome2.GConf;
-  };
-
   tambura = callPackage ../applications/audio/tambura { };
 
   teams = callPackage ../applications/networking/instant-messengers/teams { };