wsjtx: Fix qt errors

Also do minor fixes of the derivation.
This commit is contained in:
Elis Hirwing 2019-08-20 10:01:16 +02:00
parent b8fac94b0f
commit b6014da268
No known key found for this signature in database
GPG Key ID: D57EFA625C9A925F

View File

@ -1,9 +1,9 @@
{ stdenv, fetchurl, asciidoc, asciidoctor, autoconf, automake, cmake, { stdenv, fetchurl, asciidoc, asciidoctor, autoconf, automake, cmake,
docbook_xsl, fftw, fftwFloat, gfortran, libtool, libusb1, qtbase, docbook_xsl, fftw, fftwFloat, gfortran, libtool, libusb1, qtbase,
qtmultimedia, qtserialport, qttools, texinfo }: qtmultimedia, qtserialport, qttools, texinfo, wrapQtAppsHook }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "wsjtx-${version}"; pname = "wsjtx";
version = "2.1.0"; version = "2.1.0";
# This is a "superbuild" tarball containing both wsjtx and a hamlib fork # This is a "superbuild" tarball containing both wsjtx and a hamlib fork
@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
# Omitting pkgconfig because it causes issues locating the built hamlib # Omitting pkgconfig because it causes issues locating the built hamlib
nativeBuildInputs = [ nativeBuildInputs = [
asciidoc asciidoctor autoconf automake cmake docbook_xsl gfortran libtool asciidoc asciidoctor autoconf automake cmake docbook_xsl gfortran libtool
qttools texinfo qttools texinfo wrapQtAppsHook
]; ];
buildInputs = [ fftw fftwFloat libusb1 qtbase qtmultimedia qtserialport ]; buildInputs = [ fftw fftwFloat libusb1 qtbase qtmultimedia qtserialport ];
@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
These modes were all designed for making reliable, confirmed ham radio These modes were all designed for making reliable, confirmed ham radio
contacts under extreme weak-signal conditions. contacts under extreme weak-signal conditions.
''; '';
homepage = http://physics.princeton.edu/pulsar/k1jt/wsjtx.html; homepage = "https://physics.princeton.edu/pulsar/k1jt/wsjtx.html";
# Older licenses are for the statically-linked hamlib # Older licenses are for the statically-linked hamlib
license = with licenses; [ gpl3Plus gpl2Plus lgpl21Plus ]; license = with licenses; [ gpl3Plus gpl2Plus lgpl21Plus ];
platforms = platforms.linux; platforms = platforms.linux;