Porting changes from stdenv-updates into this branch.

This comes from:
svn diff  ^/nixpkgs/trunk/@18255 ^/nixpkgs/branches/stdenv-updates/ > diff
patch -p0 < diff
and then adding into svn all files new from the patch.

trunk@18255 comes from the last time I updated stdenv-updates from trunk.


svn path=/nixpkgs/stdenv-updates2/; revision=18272

pkgs/applications/networking/p2p/mldonkey/default.nix

@@ -1,4 +1,4 @@
-{stdenv, fetchurl, ocaml, zlib, ncurses}:
+{stdenv, fetchurl, ocaml, zlib, ncurses, gd, libpng}:
 
 stdenv.mkDerivation {
   name = "mldonkey-3.0.0";
@@ -13,6 +13,16 @@ stdenv.mkDerivation {
     homepage = http://mldonkey.sourceforge.net/;
   };
 
-  buildInputs = [ ocaml zlib ncurses ];
-  configureFlags = "--disable-gd --disable-gui";
+  buildInputs = [ ocaml zlib ncurses gd libpng ];
+  configureFlags = [ "--disable-gui" "--enable-ocamlver=3.11.1" ];
+
+  # Byte code compilation (the ocaml opt compiler is not supported in many platforms)
+  buildPhase = "make mlnet.byte";
+  installPhase = ''
+    ensureDir $out/bin
+    cp mlnet.byte $out/bin/mlnet
+  '';
+
+  # ocaml bytecode selfcontained binaries loose the bytecode if stripped
+  dontStrip = true;
 }