diff options
author | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2011-11-14 09:59:26 +0000 |
---|---|---|
committer | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2011-11-14 09:59:26 +0000 |
commit | 45388a9ae1639b8752652ffcde4f7d91f9594441 (patch) | |
tree | 1967b9d87e5aac2db27284c25f42cba77bae56c6 /pkgs/applications/networking/instant-messengers/amsn | |
parent | 54e4f2d5b51acd958a21e0977bbef0fdad9900fb (diff) |
Updating aMSN.
svn path=/nixpkgs/trunk/; revision=30420
Diffstat (limited to 'pkgs/applications/networking/instant-messengers/amsn')
-rw-r--r-- | pkgs/applications/networking/instant-messengers/amsn/builder.sh | 11 | ||||
-rw-r--r-- | pkgs/applications/networking/instant-messengers/amsn/default.nix | 18 |
2 files changed, 11 insertions, 18 deletions
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 4f7680b29d92e..0000000000000 --- 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 330d7e9d28135..07aa20ff1f319 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; |