public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

wsjtx: 2.1.2 -> 2.2.2

Browse Source
This commit is contained in:
MarcFontaine 2020-08-14 18:41:59 +02:00 committed by Alyssa Ross
parent cde92f9f71
commit 1fddd9f4a3
3 changed files with 4 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkgs/applications/radio/wsjtx/default.nix
View File

@ -4,12 +4,12 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "wsjtx"; pname = "wsjtx";
version = "2.1.2"; version = "2.2.2";
# This is a "superbuild" tarball containing both wsjtx and a hamlib fork # This is a "superbuild" tarball containing both wsjtx and a hamlib fork
src = fetchurl { src = fetchurl {
url = "http://physics.princeton.edu/pulsar/k1jt/wsjtx-${version}.tgz"; url = "http://physics.princeton.edu/pulsar/k1jt/wsjtx-${version}.tgz";
sha256 = "0aj3wg5xjjqwjvw6lra171ag5wq86w0hf1ra4k8mnaf0mc1qgbyl"; sha256 = "17agyrhclqyahgdwba8vi9sl7vq03sm00jlyrmjgv34a4czidg0w";
}; };
# Hamlib builds with autotools, wsjtx builds with cmake # Hamlib builds with autotools, wsjtx builds with cmake
@ -23,9 +23,6 @@ stdenv.mkDerivation rec {
# Remove Git dependency from superbuild since sources are included # Remove Git dependency from superbuild since sources are included
patches = [ ./super.patch ]; 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; { meta = with stdenv.lib; {
description = "Weak-signal digital communication modes for amateur radio"; description = "Weak-signal digital communication modes for amateur radio";
longDescription = '' longDescription = ''

4
pkgs/applications/radio/wsjtx/super.patch
View File

@ -1,8 +1,8 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3bf97a4..2c9dce5 100644 index 84fa38a..87e31bb 100644
--- a/CMakeLists.txt --- a/CMakeLists.txt
+++ b/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_library (USB_LIBRARY NAMES libusb.a usb)
Find_program (PATCH_EXECUTABLE patch REQUIRED) Find_program (PATCH_EXECUTABLE patch REQUIRED)

13
pkgs/applications/radio/wsjtx/wsjtx.patch
View File

@ -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)