Merge pull request #30146 from dpflug/master

tqsl: init at 2.3.1
This commit is contained in:
Jörg Thalheim 2017-10-06 13:34:03 +01:00 committed by GitHub
commit 3fe7cddc30
4 changed files with 54 additions and 0 deletions

View File

@ -164,6 +164,7 @@
dotlambda = "Robert Schütz <rschuetz17@gmail.com>";
doublec = "Chris Double <chris.double@double.co.nz>";
dpaetzel = "David Pätzel <david.a.paetzel@gmail.com>";
dpflug = "David Pflug <david@pflug.email>";
drets = "Dmytro Rets <dmitryrets@gmail.com>";
drewkett = "Andrew Burkett <burkett.andrew@gmail.com>";
dsferruzza = "David Sferruzza <david.sferruzza@gmail.com>";

View File

@ -0,0 +1,12 @@
diff -dur tqsl-2.3.1/src/CMakeLists.txt tqsl-2.3.1b/src/CMakeLists.txt
--- tqsl-2.3.1/src/CMakeLists.txt 2017-04-17 20:53:22.000000000 -0400
+++ tqsl-2.3.1b/src/CMakeLists.txt 2017-10-05 21:14:39.048329343 -0400
@@ -54,7 +54,7 @@
if(NOT APPLE AND NOT WIN32)
set_source_files_properties(location.cpp PROPERTIES COMPILE_DEFINITIONS CONFDIR="${CMAKE_INSTALL_PREFIX}/share/TrustedQSL/")
set(HEADERS_TO_INSTALL tqsllib.h tqslerrno.h cabrillo.h adif.h tqslconvert.h)
-install(TARGETS tqsllib DESTINATION lib$(LIB_SUFFIX))
+install(TARGETS tqsllib DESTINATION lib${LIB_SUFFIX})
install(FILES config.xml DESTINATION share/TrustedQSL)
install(FILES ${HEADERS_TO_INSTALL} DESTINATION include)
endif()

View File

@ -0,0 +1,39 @@
{ stdenv, fetchurl, makeWrapper, cmake, expat, openssl, zlib, db, curl, wxGTK }:
let
lib_suffix =
if stdenv.system == "x86_64-linux" then
"64"
else
"";
in
stdenv.mkDerivation rec {
name = "tqsl-${version}";
version = "2.3.1";
src = fetchurl {
url = "http://www.arrl.org/files/file/LoTW%20Instructions/${name}.tar.gz";
sha256 = "10cjlilampwl10hwb7m28m5z9gyrscvvc1rryfjnhj9q2x4ppgxv";
};
nativeBuildInputs = [ makeWrapper ];
buildInputs = [
cmake
expat
openssl
zlib
db
curl
wxGTK
];
patches = [ ./cmake_lib_path.patch ];
meta = with stdenv.lib; {
description = "Software for using the ARRL Logbook of the World";
homepage = https://lotw.arrl.org/;
license = licenses.bsd3;
platforms = platforms.linux;
maintainers = [ maintainers.dpflug ];
};
}

View File

@ -16724,6 +16724,8 @@ with pkgs;
toxic = callPackage ../applications/networking/instant-messengers/toxic { };
tqsl = callPackage ../applications/misc/tqsl { };
transcode = callPackage ../applications/audio/transcode { };
transcribe = callPackage ../applications/audio/transcribe { };