Merge pull request #23999 from ndowens/salut-a-toi

salut-a-toi: 0.2.0 -> 0.6.1

1 files changed, 40 insertions, 36 deletions

diff --git a/pkgs/applications/networking/instant-messengers/salut-a-toi/default.nix b/pkgs/applications/networking/instant-messengers/salut-a-toi/default.nix
index c035fc626651..f4f4aac5efa7 100644
--- a/pkgs/applications/networking/instant-messengers/salut-a-toi/default.nix
+++ b/pkgs/applications/networking/instant-messengers/salut-a-toi/default.nix
@@ -1,49 +1,53 @@
-{stdenv, fetchurl, pythonPackages}:
+{stdenv, fetchurl, python27Packages, file }:
 
 let
-  inherit (pythonPackages) python;
-in stdenv.mkDerivation rec {
-  url = "ftp://ftp.goffi.org/sat/sat-0.2.0.tar.bz2";
-  name = stdenv.lib.nameFromURL url ".tar";
-  src = fetchurl {
-    inherit url;
-    sha256 = "14qqgsgqns1xcp97nd3jcxrq54z1x5a6kimqxy029hh7ys813mf1";
-  };
-
-  buildInputs = with pythonPackages; 
+  inherit (python27Packages) python;
+in
+  stdenv.mkDerivation rec {
+    name = "salut-a-toi";
+    version = "0.6.1";
+    pname = "sat-${version}";
+
+    src = fetchurl {
+      url = "ftp://ftp.goffi.org/sat/${pname}.tar.bz2";
+      sha256 = "0kn9403n8fpzl0hsb9kkzicsmzq2fjl627l31yykbqzc4nsr780d";
+    };
+
+    buildInputs = with python27Packages; 
     [
       python twisted urwid beautifulsoup wxPython pygobject2
-      wokkel dbus-python pyfeed wrapPython setuptools
+      wokkel dbus-python pyfeed wrapPython setuptools file 
+      pycrypto pyxdg
     ];
 
-  configurePhase = ''
-    sed -i "/use_setuptools/d" 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 PYTHONPATH=\"\$PYTHONPATHPATH\":\"$PYTHONPATH\":"$out/${python.sitePackages}"" -i src/sat.sh
+    configurePhase = ''
+      sed -i "/use_setuptools/d" setup.py
+      sed -e "s@sys.prefix@'$out'@g" -i setup.py
+      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
 
-    echo 'import wokkel.muc' | python 
-  '';
+      echo 'import wokkel.muc' | python 
+    '';
 
-  buildPhase = ''
-    ${python.interpreter} setup.py build
-  '';
+    buildPhase = ''
+      ${python.interpreter} setup.py build
+    '';
 
-  installPhase = ''
-    ${python.interpreter} setup.py install --prefix="$out"
+    installPhase = ''
+      ${python.interpreter} setup.py install --prefix="$out"
 
-    for i in "$out/bin"/*; do
+      for i in "$out/bin"/*; do
       head -n 1 "$i" | grep -E '[/ ]python( |$)' && {
         wrapProgram "$i" --prefix PYTHONPATH : "$PYTHONPATH:$out/${python.sitePackages}"
       } || true 
-    done
-  '';
-  
-  meta = {
-    homepage = "http://sat.goffi.org/";
-    description = "A multi-frontend XMPP client";
-    platforms = stdenv.lib.platforms.linux;
-    maintainers = with stdenv.lib.maintainers; [raskin];
-    license = stdenv.lib.licenses.gpl3Plus;
-  };
-}
+      done
+    '';
+
+    meta = with stdenv.lib; {
+      homepage = http://sat.goffi.org/;
+      description = "A multi-frontend XMPP client";
+      platforms = platforms.linux;
+      maintainers = [ maintainers.raskin ];
+      license = licenses.gpl3Plus;
+    };
+  }