From fada7041a0cb7c92fa48a4094a7d8b32d8a96b90 Mon Sep 17 00:00:00 2001
From: Luke Sandell <lasandell@gmail.com>
Date: Sat, 5 Jan 2019 09:16:52 -0600
Subject: [PATCH] wsjtx: 1.9.1 -> 2.0.0

Old version of FT8 protocol was obsoleted on 2019-01-01.
---
 pkgs/applications/misc/wsjtx/default.nix | 13 ++++++++-----
 pkgs/applications/misc/wsjtx/super.patch | 12 ++++++++++++
 pkgs/applications/misc/wsjtx/wsjtx.patch | 12 ++++++------
 3 files changed, 26 insertions(+), 11 deletions(-)
 create mode 100644 pkgs/applications/misc/wsjtx/super.patch

diff --git a/pkgs/applications/misc/wsjtx/default.nix b/pkgs/applications/misc/wsjtx/default.nix
index fd6be8f5920..930515b9382 100644
--- a/pkgs/applications/misc/wsjtx/default.nix
+++ b/pkgs/applications/misc/wsjtx/default.nix
@@ -4,12 +4,12 @@
 
 stdenv.mkDerivation rec {
   name = "wsjtx-${version}";
-  version = "1.9.1";
+  version = "2.0.0";
 
-  # This is a composite source tarball containing both wsjtx and a hamlib fork
+  # This is a "superbuild" tarball containing both wsjtx and a hamlib fork
   src = fetchurl {
-    url = "http://physics.princeton.edu/pulsar/K1JT/wsjtx-${version}.tgz";
-    sha256 = "143r17fri08mwz28g17wcfxy60h3xgfk46mln5lmdr9k6355aqqc";
+    url = "http://physics.princeton.edu/pulsar/k1jt/wsjtx-${version}.tgz";
+    sha256 = "66434f69f256742da1fe057ec51e4464cab2614f0bfb1a310c04a385b77bd014";
   };
 
   # Hamlib builds with autotools, wsjtx builds with cmake
@@ -20,7 +20,10 @@ stdenv.mkDerivation rec {
   ];
   buildInputs = [ fftw fftwFloat libusb1 qtbase qtmultimedia qtserialport ];
 
-  # Composite build has its own patch step after it extracts the inner archives
+  # Remove Git dependency from superbuild since sources are included
+  patches = [ ./super.patch ];
+
+  # Superbuild has its own patch step after it extracts the inner archives
   postPatch = "cp ${./wsjtx.patch} wsjtx.patch";
 
   meta = with stdenv.lib; {
diff --git a/pkgs/applications/misc/wsjtx/super.patch b/pkgs/applications/misc/wsjtx/super.patch
new file mode 100644
index 00000000000..d903171ffc5
--- /dev/null
+++ b/pkgs/applications/misc/wsjtx/super.patch
@@ -0,0 +1,12 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 3bf97a4..2c9dce5 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -23,7 +23,6 @@ source tarball." )
+ #
+ # Find_library (USB_LIBRARY NAMES libusb.a usb)
+ Find_program (PATCH_EXECUTABLE patch REQUIRED)
+-Find_package (Git REQUIRED)
+ 
+ #
+ # extra C flags to minimize hamlib excutable sizes
diff --git a/pkgs/applications/misc/wsjtx/wsjtx.patch b/pkgs/applications/misc/wsjtx/wsjtx.patch
index a5bd7ec3e19..e92b420e58a 100644
--- a/pkgs/applications/misc/wsjtx/wsjtx.patch
+++ b/pkgs/applications/misc/wsjtx/wsjtx.patch
@@ -1,11 +1,11 @@
-Index: wsjtx/CMakeLists.txt
-===================================================================
---- wsjtx/CMakeLists.txt	(revision 8382)
-+++ wsjtx/CMakeLists.txt	(working copy)
-@@ -866,6 +866,7 @@
- find_package (Qt5Widgets 5 REQUIRED)
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 3e7e816b..e7dbb14a 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -860,6 +860,7 @@ find_package (Qt5Widgets 5 REQUIRED)
  find_package (Qt5Multimedia 5 REQUIRED)
  find_package (Qt5PrintSupport 5 REQUIRED)
+ find_package (Qt5Sql 5 REQUIRED)
 +find_package (Qt5SerialPort 5 REQUIRED)
  
  if (WIN32)