From 45388a9ae1639b8752652ffcde4f7d91f9594441 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Mon, 14 Nov 2011 09:59:26 +0000
Subject: [PATCH] Updating aMSN.

svn path=/nixpkgs/trunk/; revision=30420
---
 .../instant-messengers/amsn/builder.sh         | 11 -----------
 .../instant-messengers/amsn/default.nix        | 18 +++++++++++-------
 2 files changed, 11 insertions(+), 18 deletions(-)
 delete mode 100644 pkgs/applications/networking/instant-messengers/amsn/builder.sh

diff --git a/pkgs/applications/networking/instant-messengers/amsn/builder.sh b/pkgs/applications/networking/instant-messengers/amsn/builder.sh
deleted file mode 100644
index 4f7680b29d92..000000000000
--- a/pkgs/applications/networking/instant-messengers/amsn/builder.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-source $stdenv/setup
-
-echo $libstdcpp
-echo "-L$libstdcpp/lib"
-LDFLAGS="-L$libstdcpp/lib"
-CPPFLAGS="-L$libstdcpp/include"
-CFLAGS="-lm"
-
-configureFlags="--with-tcl=$tcl/lib --with-tk=$tk/lib --enable-static"
-
-genericBuild
diff --git a/pkgs/applications/networking/instant-messengers/amsn/default.nix b/pkgs/applications/networking/instant-messengers/amsn/default.nix
index 330d7e9d2813..07aa20ff1f31 100644
--- a/pkgs/applications/networking/instant-messengers/amsn/default.nix
+++ b/pkgs/applications/networking/instant-messengers/amsn/default.nix
@@ -1,15 +1,19 @@
-{stdenv, fetchurl, which, tcl, tk, x11, libstdcpp }:
+{stdenv, fetchurl, which, tcl, tk, x11, libpng, libjpeg, makeWrapper}:
 
 stdenv.mkDerivation {
-  name = "amsn-0.96";
-  builder = ./builder.sh;
+  name = "amsn-0.98.4";
   src = fetchurl {
-    url = mirror://sourceforge/amsn/amsn-0.96.tar.bz2;
-    md5 = "3df6b0d34ef1997a47c0b8af29b2547a";
+    url = mirror://sourceforge/amsn/amsn-0.98.4-src.tar.gz;
+    sha256 = "1kcn1hc6bvgy4svf5l3j5psdrvsmy0p3r33fn7gzcinqdf3xfgqx";
   };
 
-  inherit tcl tk libstdcpp;
-  buildInputs = [which tcl tk x11 ];
+  configureFlags = "--with-tcl=${tcl}/lib --with-tk=${tk}/lib --enable-static";
+
+  buildInputs = [which tcl tk x11 libpng libjpeg makeWrapper];
+
+  postInstall = ''
+    wrapProgram $out/bin/amsn --prefix PATH : ${tk}/bin
+  '';
 
   meta = {
     homepage = http://amsn-project.net;