diff options
author | Jörg Thalheim <Mic92@users.noreply.github.com> | 2017-10-06 13:34:03 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-10-06 13:34:03 +0100 |
commit | 3fe7cddc304abb86e61a750a4f807270c7ca7825 (patch) | |
tree | 6aac9756a93b88b4b15dd401fb820e3c400df367 | |
parent | 929eadebb0339ace4b72e7e678ee8108f3c01d62 (diff) | |
parent | a6d570dd496c4b9d897b8c8c69844c72bc7d3b66 (diff) | |
download | nixlib-3fe7cddc304abb86e61a750a4f807270c7ca7825.tar nixlib-3fe7cddc304abb86e61a750a4f807270c7ca7825.tar.gz nixlib-3fe7cddc304abb86e61a750a4f807270c7ca7825.tar.bz2 nixlib-3fe7cddc304abb86e61a750a4f807270c7ca7825.tar.lz nixlib-3fe7cddc304abb86e61a750a4f807270c7ca7825.tar.xz nixlib-3fe7cddc304abb86e61a750a4f807270c7ca7825.tar.zst nixlib-3fe7cddc304abb86e61a750a4f807270c7ca7825.zip |
Merge pull request #30146 from dpflug/master
tqsl: init at 2.3.1
-rw-r--r-- | lib/maintainers.nix | 1 | ||||
-rw-r--r-- | pkgs/applications/misc/tqsl/cmake_lib_path.patch | 12 | ||||
-rw-r--r-- | pkgs/applications/misc/tqsl/default.nix | 39 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
4 files changed, 54 insertions, 0 deletions
diff --git a/lib/maintainers.nix b/lib/maintainers.nix index 74972203af06..0076d9740ab1 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -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>"; diff --git a/pkgs/applications/misc/tqsl/cmake_lib_path.patch b/pkgs/applications/misc/tqsl/cmake_lib_path.patch new file mode 100644 index 000000000000..5eed93834632 --- /dev/null +++ b/pkgs/applications/misc/tqsl/cmake_lib_path.patch @@ -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() diff --git a/pkgs/applications/misc/tqsl/default.nix b/pkgs/applications/misc/tqsl/default.nix new file mode 100644 index 000000000000..829ed2585627 --- /dev/null +++ b/pkgs/applications/misc/tqsl/default.nix @@ -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 ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6d017f39cb56..8582966e81dc 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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 { }; |