salut-a-toi: 0.2.0 -> 0.6.1

salut-a-toi: Removed un-needed python variable in function
This commit is contained in:
ndowens 2017-03-17 19:34:28 -05:00
parent 1129f92f65
commit d26775fce7

View File

@ -1,25 +1,29 @@
{stdenv, fetchurl, pythonPackages}: {stdenv, fetchurl, python27Packages, file }:
let let
inherit (pythonPackages) python; inherit (python27Packages) python;
in stdenv.mkDerivation rec { in
url = "ftp://ftp.goffi.org/sat/sat-0.2.0.tar.bz2"; stdenv.mkDerivation rec {
name = stdenv.lib.nameFromURL url ".tar"; name = "salut-a-toi";
version = "0.6.1";
pname = "sat-${version}";
src = fetchurl { src = fetchurl {
inherit url; url = "ftp://ftp.goffi.org/sat/${pname}.tar.bz2";
sha256 = "14qqgsgqns1xcp97nd3jcxrq54z1x5a6kimqxy029hh7ys813mf1"; sha256 = "0kn9403n8fpzl0hsb9kkzicsmzq2fjl627l31yykbqzc4nsr780d";
}; };
buildInputs = with pythonPackages; buildInputs = with python27Packages;
[ [
python twisted urwid beautifulsoup wxPython pygobject2 python twisted urwid beautifulsoup wxPython pygobject2
wokkel dbus-python pyfeed wrapPython setuptools wokkel dbus-python pyfeed wrapPython setuptools file
pycrypto pyxdg
]; ];
configurePhase = '' configurePhase = ''
sed -i "/use_setuptools/d" setup.py sed -i "/use_setuptools/d" setup.py
sed -e "s@sys.prefix@'$out'@g" -i setup.py sed -e "s@sys.prefix@'$out'@g" -i setup.py
sed -e "1aexport PATH=\"\$PATH\":\"$out/bin\":\"${pythonPackages.twisted}/bin\"" -i src/sat.sh sed -e "1aexport PATH=\"\$PATH\":\"$out/bin\":\"${python27Packages.twisted}/bin\"" -i src/sat.sh
sed -e "1aexport PYTHONPATH=\"\$PYTHONPATHPATH\":\"$PYTHONPATH\":"$out/${python.sitePackages}"" -i src/sat.sh sed -e "1aexport PYTHONPATH=\"\$PYTHONPATHPATH\":\"$PYTHONPATH\":"$out/${python.sitePackages}"" -i src/sat.sh
echo 'import wokkel.muc' | python echo 'import wokkel.muc' | python
@ -39,11 +43,11 @@ in stdenv.mkDerivation rec {
done done
''; '';
meta = { meta = with stdenv.lib; {
homepage = "http://sat.goffi.org/"; homepage = http://sat.goffi.org/;
description = "A multi-frontend XMPP client"; description = "A multi-frontend XMPP client";
platforms = stdenv.lib.platforms.linux; platforms = platforms.linux;
maintainers = with stdenv.lib.maintainers; [raskin]; maintainers = [ maintainers.raskin ];
license = stdenv.lib.licenses.gpl3Plus; license = licenses.gpl3Plus;
}; };
} }