From df6875914226bca3ee6efeb02890662ce721fe44 Mon Sep 17 00:00:00 2001 From: Lluís Batlle i Rossell Date: Sat, 16 Jan 2010 16:41:33 +0000 Subject: Updating from trunk, to get the new mldonkey. Cleaning the mldonkey expression to build with the ocaml native compiler in some platforms, and with the bytecode in others. Removing the flag to support ocaml-3.11.1, as it is included in this new version of mldonkey. svn path=/nixpkgs/branches/stdenv-updates/; revision=19487 --- pkgs/applications/networking/p2p/mldonkey/default.nix | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) (limited to 'pkgs/applications/networking/p2p') diff --git a/pkgs/applications/networking/p2p/mldonkey/default.nix b/pkgs/applications/networking/p2p/mldonkey/default.nix index 02a5e22eb23f..dfe79bff15e7 100644 --- a/pkgs/applications/networking/p2p/mldonkey/default.nix +++ b/pkgs/applications/networking/p2p/mldonkey/default.nix @@ -1,11 +1,11 @@ -{stdenv, fetchurl, ocaml, zlib, ncurses, gd, libpng}: +{stdenv, fetchurl, ocaml, zlib, bzip2, ncurses, file, gd, libpng }: -stdenv.mkDerivation { - name = "mldonkey-3.0.0"; +stdenv.mkDerivation (rec { + name = "mldonkey-3.0.1"; src = fetchurl { - url = mirror://sourceforge/mldonkey/mldonkey-3.0.0.tar.bz2; - sha256 = "0zzvcfnbhxk8axfch5fbkd9j2ks67nbb1ndjjarxvrza78g5y8r7"; + url = "mirror://sourceforge/mldonkey/${name}.tar.bz2"; + sha256 = "09zk53rfdkjipf5sl37rypzi2mx0a5v57vsndj22zajkqr4l0zds"; }; meta = { @@ -13,9 +13,10 @@ stdenv.mkDerivation { homepage = http://mldonkey.sourceforge.net/; }; - buildInputs = [ ocaml zlib ncurses gd libpng ]; - configureFlags = [ "--disable-gui" "--enable-ocamlver=3.11.1" ]; - + buildInputs = [ ocaml zlib ncurses bzip2 file gd libpng ]; + configureFlags = [ "--disable-gui" ]; +} // (if (stdenv.system != "i686-linux" && stdenv.system != "x86_64-linux") then +{ # Byte code compilation (the ocaml opt compiler is not supported in many platforms) buildPhase = "make mlnet.byte"; installPhase = '' @@ -25,4 +26,4 @@ stdenv.mkDerivation { # ocaml bytecode selfcontained binaries loose the bytecode if stripped dontStrip = true; -} +} else {})) -- cgit 1.4.1