From 9e90d9e5a30238aedd92f3fcdc54658687cd9879 Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Sun, 23 Jul 2017 12:47:30 +0200
Subject: [PATCH] gpsbabel: 1.5.3 -> 1.5.4

Also really use QT5 and switch download location to GitHub.
---
 pkgs/applications/misc/gpsbabel/default.nix | 16 ++++++++--------
 pkgs/top-level/all-packages.nix             |  2 +-
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/pkgs/applications/misc/gpsbabel/default.nix b/pkgs/applications/misc/gpsbabel/default.nix
index ace89cd8a21b..90ae1a87654d 100644
--- a/pkgs/applications/misc/gpsbabel/default.nix
+++ b/pkgs/applications/misc/gpsbabel/default.nix
@@ -1,14 +1,14 @@
-{ lib, stdenv, fetchurl, fetchpatch, zlib, qt4, which, IOKit }:
+{ lib, stdenv, fetchFromGitHub, fetchpatch, zlib, which, IOKit, qtbase }:
 
 stdenv.mkDerivation rec {
   name = "gpsbabel-${version}";
-  version = "1.5.3";
+  version = "1.5.4";
 
-  src = fetchurl {
-    # gpgbabel.org makes it hard to get the source tarball automatically, so
-    # get it from elsewhere.
-    url = "mirror://debian/pool/main/g/gpsbabel/gpsbabel_${version}.orig.tar.gz";
-    sha256 = "0l6c8911f7i5bbdzah9irhqf127ib0b7lv53rb8r9z8g439mznq1";
+  src = fetchFromGitHub {
+    owner = "gpsbabel";
+    repo = "gpsbabel";
+    rev = "gpsbabel_${lib.replaceStrings ["."] ["_"] version}";
+    sha256 = "0v6wpp14zkfbarmksf9dn3wmpj1araxd7xi5xp7gpl7kafb9aiwi";
   };
 
   patches = [
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
     })
   ];
 
-  buildInputs = [ zlib qt4 which ]
+  buildInputs = [ zlib qtbase which ]
     ++ lib.optionals stdenv.isDarwin [ IOKit ];
 
   /* FIXME: Building the documentation, with "make doc", requires this:
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 395a80857456..fb048c04151a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14528,7 +14528,7 @@ with pkgs;
 
   gosmore = callPackage ../applications/misc/gosmore { };
 
-  gpsbabel = libsForQt5.callPackage ../applications/misc/gpsbabel {
+  gpsbabel = libsForQt56.callPackage ../applications/misc/gpsbabel {
     inherit (darwin) IOKit;
   };