direwolf: 1.2 -> 1.3

alaLib as optional

Remove extra stdenv.lib

(@7c6f434c) fixed a typo - pushing instead of #24105
This commit is contained in:
ndowens 2017-03-19 21:02:01 -05:00 committed by Michael Raskin
parent a7cb6997aa
commit c86f005137

View File

@ -1,38 +1,43 @@
{ stdenv, fetchFromGitHub, unzip, alsaLib }: { stdenv, fetchFromGitHub
let , espeak, alsaLib, perl
version = "1.2"; , python }:
in
with stdenv.lib;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "direwolf-${version}"; name = "direwolf-${version}";
inherit version; version = "1.3";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "wb2osz"; owner = "wb2osz";
repo = "direwolf"; repo = "direwolf";
rev = "8b81a32"; rev = version;
sha256 = "0r4fgdxghh292bzhqshr7zl5cg2lfsvlgmy4d5vqcli7x6qa1gcs"; sha256 = "1x6vvl3fy70ic5pqvqsyr0bkqwim8m9jaqnm5ls8z8i66rwq23fg";
}; };
buildInputs = [ buildInputs = [
unzip alsaLib espeak perl python
]; ] ++ (optional stdenv.isLinux alsaLib);
patchPhase = '' patchPhase = ''
substituteInPlace Makefile.linux \ substituteInPlace Makefile.* \
--replace "/usr/local" "$out" \ --replace /usr/share $out/share
--replace "/usr/share" "$out/share"
'';
preInstall = '' substituteInPlace dwespeak.sh \
--replace espeak ${espeak}/bin/espeak
'';
installPhase = ''
mkdir -p $out/bin mkdir -p $out/bin
''; make INSTALLDIR=$out install
'';
meta = with stdenv.lib; { meta = {
description = "A Soundcard Packet TNC, APRS Digipeater, IGate, APRStt gateway"; description = "A Soundcard Packet TNC, APRS Digipeater, IGate, APRStt gateway";
# On the page: This page will be disappearing on October 8, 2015. # 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; license = licenses.gpl2;
platforms = platforms.linux; platforms = platforms.unix;
maintainers = [ maintainers.the-kenny ]; maintainers = [ maintainers.the-kenny ];
}; };
} }