ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-09-23 05:37:27 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #55509 from etu/update-tqsl

Browse Source 
tqsl: 2.3.1 -> 2.4.3
This commit is contained in:
Elis Hirwing 2019-02-14 07:21:27 +01:00 committed by GitHub
commit 6a56ab5bc8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkgs/applications/misc/tqsl/cmake_lib_path.patch
View File

@ -1,12 +0,0 @@
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()

12
pkgs/applications/misc/tqsl/default.nix → pkgs/applications/radio/tqsl/default.nix
View File

@ -1,12 +1,12 @@
{ stdenv, fetchurl, makeWrapper, cmake, expat, openssl, zlib, db, curl, wxGTK }:
stdenv.mkDerivation rec {
name = "tqsl-${version}";
version = "2.3.1";
pname = "tqsl";
version = "2.4.3";
src = fetchurl {
url = "https://www.arrl.org/files/file/LoTW%20Instructions/${name}.tar.gz";
sha256 = "10cjlilampwl10hwb7m28m5z9gyrscvvc1rryfjnhj9q2x4ppgxv";
url = "https://www.arrl.org/files/file/LoTW%20Instructions/${pname}-${version}.tar.gz";
sha256 = "0f8pa5wnp0x0mjjr5kanka9hirgmp5wf6jsb95dc6hjlzlvy6kz9";
};
nativeBuildInputs = [ makeWrapper ];
@ -20,11 +20,9 @@ stdenv.mkDerivation rec {
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/;
homepage = https://www.arrl.org/tqsl-download;
license = licenses.bsd3;
platforms = platforms.linux;
maintainers = [ maintainers.dpflug ];

3
pkgs/top-level/all-packages.nix
View File

@ -19685,7 +19685,8 @@ in
toxiproxy = callPackage ../development/tools/toxiproxy { };
tqsl = callPackage ../applications/misc/tqsl { };
tqsl = callPackage ../applications/radio/tqsl { };
trustedqsl = tqsl; # Alias added 2019-02-10
transcode = callPackage ../applications/audio/transcode { };