From df6875914226bca3ee6efeb02890662ce721fe44 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Sat, 16 Jan 2010 16:41:33 +0000
Subject: [PATCH] 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
---
 .../networking/p2p/mldonkey/default.nix       | 19 ++++++++++---------
 pkgs/top-level/all-packages.nix               |  2 +-
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/pkgs/applications/networking/p2p/mldonkey/default.nix b/pkgs/applications/networking/p2p/mldonkey/default.nix
index 02a5e22eb23..dfe79bff15e 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 {}))
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index bb59b7c5ab2..92318faa970 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1043,7 +1043,7 @@ let
   };
 
   mldonkey = import ../applications/networking/p2p/mldonkey {
-    inherit fetchurl stdenv ocaml zlib ncurses gd libpng;
+    inherit fetchurl stdenv ocaml zlib bzip2 ncurses file gd libpng;
   };
 
   monit = builderDefsPackage ../tools/system/monit {