git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #93379 from lasandell/direwolf-1.5

direwolf 1.4 -> 1.5

commit0657fe4bf44b14a9d55f40124b5026a549c3fce2 authormarkuskowa <markus.kowalewski@gmail.com> dateTue 18 Aug 2020, 10:40 (6 years ago) parent8a9f58aeabbf3d
3 files changed+58−44
pkgs/applications/misc/direwolf/default.nix−43 pkgs/applications/radio/direwolf/default.nix+57 pkgs/top-level/all-packages.nix+1−1
pkgs/applications/misc/direwolf/default.nixdeleted−43
@@ -1,43 +0,0 @@
1−{ stdenv, fetchFromGitHub
2−, espeak, alsaLib, perl
3−, python }:
4−
5−with stdenv.lib;
6−
7−stdenv.mkDerivation rec {
8− pname = "direwolf";
9− version = "1.4";
10−
11− src = fetchFromGitHub {
12− owner = "wb2osz";
13− repo = "direwolf";
14− rev = version;
15− sha256 = "033sffjs2dz48077hc58jr4lxxs8md1fyfh4lig6ib7pyigiv1y0";
16− };
17−
18− buildInputs = [
19− espeak perl python
20− ] ++ (optional stdenv.isLinux alsaLib);
21−
22− postPatch = ''
23− for i in Makefile.*; do
24− substituteInPlace "$i" \
25− --replace /usr/share $out/share
26− done
27−
28− substituteInPlace dwespeak.sh \
29− --replace espeak ${espeak}/bin/espeak
30− '';
31−
32− preInstall = ''
33− mkdir -p $out/bin
34− '';
35− installFlags = [ "INSTALLDIR=$(out)" ];
36−
37− meta = {
38− description = "A Soundcard Packet TNC, APRS Digipeater, IGate, APRStt gateway";
39− homepage = "https://github.com/wb2osz/direwolf/";
40− license = licenses.gpl2;
41− platforms = platforms.unix;
42− };
43−}
pkgs/applications/radio/direwolf/default.nixnew file+57
@@ -0,0 +1,57 @@
1+{ stdenv, fetchFromGitHub
2+, alsaLib, espeak, glibc, gpsd
3+, hamlib, perl, python, udev }:
4+
5+with stdenv.lib;
6+
7+stdenv.mkDerivation rec {
8+ pname = "direwolf";
9+ version = "1.5";
10+
11+ src = fetchFromGitHub {
12+ owner = "wb2osz";
13+ repo = "direwolf";
14+ rev = version;
15+ sha256 = "1w55dv9xqgc9mpincsj017838vmvdy972fhis3ddskyfvhhzgcsk";
16+ };
17+
18+ buildInputs = [
19+ espeak gpsd hamlib perl python
20+ ] ++ (optionals stdenv.isLinux [alsaLib udev]);
21+
22+ makeFlags = [ "DESTDIR=$(out)" ];
23+
24+ postPatch = ''
25+ substituteInPlace symbols.c \
26+ --replace /usr/share/direwolf/symbols-new.txt $out/share/direwolf/symbols-new.txt \
27+ --replace /opt/local/share/direwolf/symbols-new.txt $out/share/direwolf/symbols-new.txt
28+ substituteInPlace decode_aprs.c \
29+ --replace /usr/share/direwolf/tocalls.txt $out/share/direwolf/tocalls.txt \
30+ --replace /opt/local/share/direwolf/tocalls.txt $out/share/direwolf/tocalls.txt
31+ substituteInPlace dwespeak.sh \
32+ --replace espeak ${espeak}/bin/espeak
33+ '' + (optionalString stdenv.isLinux ''
34+ substituteInPlace Makefile.linux \
35+ --replace /usr/include/pthread.h ${stdenv.glibc.dev}/include/pthread.h \
36+ --replace /usr/include/alsa ${alsaLib.dev}/include/alsa \
37+ --replace /usr/include/gps.h ${gpsd}/include/gps.h \
38+ --replace /usr/include/hamlib ${hamlib}/include/hamlib \
39+ --replace /usr/include/libudev.h ${udev.dev}/include/libudev.h \
40+ --replace /etc/udev $out/etc/udev \
41+ --replace 'Exec=xterm -hold -title \"Dire Wolf\" -bg white -e \"$(DESTDIR)/bin/direwolf\"' "Exec=$out/bin/direwolf" \
42+ --replace '#Terminal=true' 'Terminal=true' \
43+ --replace 'Path=$(HOME)' '#Path='
44+ '');
45+
46+ preInstall = ''
47+ mkdir -p $out/bin
48+ '';
49+
50+ meta = {
51+ description = "A Soundcard Packet TNC, APRS Digipeater, IGate, APRStt gateway";
52+ homepage = "https://github.com/wb2osz/direwolf/";
53+ license = licenses.gpl2;
54+ platforms = platforms.unix;
55+ maintainers = with maintainers; [ lasandell ];
56+ };
57+}
pkgs/top-level/all-packages.nix+1−1
@@ -19696,7 +19696,7 @@ in
1969619696 inherit (pkgs.gnome2) libart_lgpl libgnomeui;
1969719697 };
1969819698
19699− direwolf = callPackage ../applications/misc/direwolf { };
19699+ direwolf = callPackage ../applications/radio/direwolf { };
1970019700
1970119701 dirt = callPackage ../applications/audio/dirt {};
1970219702