wsjtx: 2.1.2 -> 2.2.2

NixOS · Aug 16, 2020 · 1fddd9f · 1fddd9f
1 parent cde92f9
commit 1fddd9f
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 20 deletions.
diff --git 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
@@ -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