alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

Merge pull request #53466 from lasandell/wsjtx-2.0.0

Browse source 
wsjtx: 1.9.1 -> 2.0.0
This commit is contained in:
markuskowa 2019-01-06 12:58:33 +01:00 committed by GitHub
parent 9211bcc7ea fada7041a0
commit f4dcb6f03e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 26 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
pkgs/applications/misc/wsjtx/default.nix
View file

@ -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; {

12
pkgs/applications/misc/wsjtx/super.patch Normal file
View file

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

12
pkgs/applications/misc/wsjtx/wsjtx.patch
View file

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