From 1fddd9f4a33a316f6f53eeff9a2fa6eb8d7e59ba Mon Sep 17 00:00:00 2001
From: MarcFontaine <MarcFontaine@users.noreply.github.com>
Date: Fri, 14 Aug 2020 18:41:59 +0200
Subject: [PATCH] wsjtx: 2.1.2 -> 2.2.2

---
 pkgs/applications/radio/wsjtx/default.nix |  7 ++-----
 pkgs/applications/radio/wsjtx/super.patch |  4 ++--
 pkgs/applications/radio/wsjtx/wsjtx.patch | 13 -------------
 3 files changed, 4 insertions(+), 20 deletions(-)
 delete mode 100644 pkgs/applications/radio/wsjtx/wsjtx.patch

diff --git a/pkgs/applications/radio/wsjtx/default.nix b/pkgs/applications/radio/wsjtx/default.nix
index 8e135dee56818a..b11b6b474c645d 100644
--- a/pkgs/applications/radio/wsjtx/default.nix
+++ b/pkgs/applications/radio/wsjtx/default.nix
@@ -4,12 +4,12 @@
 
 stdenv.mkDerivation rec {
   pname = "wsjtx";
-  version = "2.1.2";
+  version = "2.2.2";
 
   # 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 = "0aj3wg5xjjqwjvw6lra171ag5wq86w0hf1ra4k8mnaf0mc1qgbyl";
+    sha256 = "17agyrhclqyahgdwba8vi9sl7vq03sm00jlyrmjgv34a4czidg0w";
   };
 
   # Hamlib builds with autotools, wsjtx builds with cmake
@@ -23,9 +23,6 @@ stdenv.mkDerivation rec {
   # 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; {
     description = "Weak-signal digital communication modes for amateur radio";
     longDescription = ''
diff --git a/pkgs/applications/radio/wsjtx/super.patch b/pkgs/applications/radio/wsjtx/super.patch
index d903171ffc5aee..2d72fcddf0dcc9 100644
--- a/pkgs/applications/radio/wsjtx/super.patch
+++ b/pkgs/applications/radio/wsjtx/super.patch
@@ -1,8 +1,8 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 3bf97a4..2c9dce5 100644
+index 84fa38a..87e31bb 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -23,7 +23,6 @@ source tarball." )
+@@ -24,7 +24,6 @@ source tarball." )
  #
  # Find_library (USB_LIBRARY NAMES libusb.a usb)
  Find_program (PATCH_EXECUTABLE patch REQUIRED)
diff --git a/pkgs/applications/radio/wsjtx/wsjtx.patch b/pkgs/applications/radio/wsjtx/wsjtx.patch
deleted file mode 100644
index fd7c40fdc13de3..00000000000000
--- a/pkgs/applications/radio/wsjtx/wsjtx.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 3e7e816b..e7dbb14a 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -885,6 +885,6 @@
- #
- 
- # Widgets finds its own dependencies.
--find_package (Qt5 COMPONENTS Widgets Multimedia PrintSupport Sql LinguistTools REQUIRED)
-+find_package (Qt5 COMPONENTS Widgets Multimedia PrintSupport Sql LinguistTools SerialPort REQUIRED)
- 
- if (WIN32)
-   add_definitions (-DQT_NEEDS_QTMAIN)