git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #53466 from lasandell/wsjtx-2.0.0

wsjtx: 1.9.1 -> 2.0.0

commitf4dcb6f03e8215eaf845a7acba77b5197feae4f4 authormarkuskowa <markus.kowalewski@gmail.com> dateSun 6 Jan 2019, 12:58 (8 years ago) parent9211bccfada704
3 files changed+26−11
pkgs/applications/misc/wsjtx/default.nix+8−5 pkgs/applications/misc/wsjtx/super.patch+12 pkgs/applications/misc/wsjtx/wsjtx.patch+6−6
pkgs/applications/misc/wsjtx/default.nix+8−5
@@ -4,12 +4,12 @@
44
55stdenv.mkDerivation rec {
66 name = "wsjtx-${version}";
7− version = "1.9.1";
7+ version = "2.0.0";
88
9− # This is a composite source tarball containing both wsjtx and a hamlib fork
9+ # This is a "superbuild" tarball containing both wsjtx and a hamlib fork
1010 src = fetchurl {
11− url = "http://physics.princeton.edu/pulsar/K1JT/wsjtx-${version}.tgz";
12− sha256 = "143r17fri08mwz28g17wcfxy60h3xgfk46mln5lmdr9k6355aqqc";
11+ url = "http://physics.princeton.edu/pulsar/k1jt/wsjtx-${version}.tgz";
12+ sha256 = "66434f69f256742da1fe057ec51e4464cab2614f0bfb1a310c04a385b77bd014";
1313 };
1414
1515 # Hamlib builds with autotools, wsjtx builds with cmake
@@ -20,7 +20,10 @@ stdenv.mkDerivation rec {
2020 ];
2121 buildInputs = [ fftw fftwFloat libusb1 qtbase qtmultimedia qtserialport ];
2222
23− # Composite build has its own patch step after it extracts the inner archives
23+ # Remove Git dependency from superbuild since sources are included
24+ patches = [ ./super.patch ];
25+
26+ # Superbuild has its own patch step after it extracts the inner archives
2427 postPatch = "cp ${./wsjtx.patch} wsjtx.patch";
2528
2629 meta = with stdenv.lib; {
pkgs/applications/misc/wsjtx/super.patchnew file+12
@@ -0,0 +1,12 @@
1+diff --git a/CMakeLists.txt b/CMakeLists.txt
2+index 3bf97a4..2c9dce5 100644
3+--- a/CMakeLists.txt
4++++ b/CMakeLists.txt
5+@@ -23,7 +23,6 @@ source tarball." )
6+ #
7+ # Find_library (USB_LIBRARY NAMES libusb.a usb)
8+ Find_program (PATCH_EXECUTABLE patch REQUIRED)
9+-Find_package (Git REQUIRED)
10+
11+ #
12+ # extra C flags to minimize hamlib excutable sizes
pkgs/applications/misc/wsjtx/wsjtx.patch+6−6
@@ -1,11 +1,11 @@
1−Index: wsjtx/CMakeLists.txt
2−===================================================================
3−--- wsjtx/CMakeLists.txt (revision 8382)
4−+++ wsjtx/CMakeLists.txt (working copy)
5−@@ -866,6 +866,7 @@
6− find_package (Qt5Widgets 5 REQUIRED)
1+diff --git a/CMakeLists.txt b/CMakeLists.txt
2+index 3e7e816b..e7dbb14a 100644
3+--- a/CMakeLists.txt
4++++ b/CMakeLists.txt
5+@@ -860,6 +860,7 @@ find_package (Qt5Widgets 5 REQUIRED)
76 find_package (Qt5Multimedia 5 REQUIRED)
87 find_package (Qt5PrintSupport 5 REQUIRED)
8+ find_package (Qt5Sql 5 REQUIRED)
99+find_package (Qt5SerialPort 5 REQUIRED)
1010
1111 if (WIN32)