diff options
author | ndowens <ndowens04@gmail.com> | 2017-03-19 21:02:01 -0500 |
---|---|---|
committer | Michael Raskin <7c6f434c@mail.ru> | 2017-03-24 17:27:59 +0100 |
commit | c86f005137cde36de457572eec99dca58ffff1be (patch) | |
tree | 1e5d8a70b720b582f4a0ad7390ada5f5b97e3c4e /pkgs/applications/misc/direwolf | |
parent | a7cb6997aa411715c3b4bbfac79b154d2ec032c6 (diff) |
direwolf: 1.2 -> 1.3
alaLib as optional Remove extra stdenv.lib (@7c6f434c) fixed a typo - pushing instead of #24105
Diffstat (limited to 'pkgs/applications/misc/direwolf')
-rw-r--r-- | pkgs/applications/misc/direwolf/default.nix | 43 |
1 files changed, 24 insertions, 19 deletions
diff --git a/pkgs/applications/misc/direwolf/default.nix b/pkgs/applications/misc/direwolf/default.nix index 0341ffc64af82..d4c8b1ada6c35 100644 --- a/pkgs/applications/misc/direwolf/default.nix +++ b/pkgs/applications/misc/direwolf/default.nix @@ -1,38 +1,43 @@ -{ stdenv, fetchFromGitHub, unzip, alsaLib }: -let - version = "1.2"; -in +{ stdenv, fetchFromGitHub +, espeak, alsaLib, perl +, python }: + +with stdenv.lib; + stdenv.mkDerivation rec { name = "direwolf-${version}"; - inherit version; + version = "1.3"; src = fetchFromGitHub { owner = "wb2osz"; repo = "direwolf"; - rev = "8b81a32"; - sha256 = "0r4fgdxghh292bzhqshr7zl5cg2lfsvlgmy4d5vqcli7x6qa1gcs"; + rev = version; + sha256 = "1x6vvl3fy70ic5pqvqsyr0bkqwim8m9jaqnm5ls8z8i66rwq23fg"; }; buildInputs = [ - unzip alsaLib - ]; + espeak perl python + ] ++ (optional stdenv.isLinux alsaLib); patchPhase = '' - substituteInPlace Makefile.linux \ - --replace "/usr/local" "$out" \ - --replace "/usr/share" "$out/share" - ''; + substituteInPlace Makefile.* \ + --replace /usr/share $out/share + + substituteInPlace dwespeak.sh \ + --replace espeak ${espeak}/bin/espeak + ''; - preInstall = '' - mkdir -p $out/bin - ''; + installPhase = '' + mkdir -p $out/bin + make INSTALLDIR=$out install + ''; - meta = with stdenv.lib; { + meta = { description = "A Soundcard Packet TNC, APRS Digipeater, IGate, APRStt gateway"; # On the page: This page will be disappearing on October 8, 2015. - homepage = https://home.comcast.net/~wb2osz/site/; + homepage = https://github.com/wb2osz/direwolf/; license = licenses.gpl2; - platforms = platforms.linux; + platforms = platforms.unix; maintainers = [ maintainers.the-kenny ]; }; } |