BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Updating from trunk, to get the new mldonkey.

Browse source 
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
This commit is contained in:
Lluís Batlle i Rossell 2010-01-16 16:41:33 +00:00
parent 70dd97620c
commit df68759142
2 changed files with 11 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
pkgs/applications/networking/p2p/mldonkey/default.nix
View file

@ -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 {}))

2
pkgs/top-level/all-packages.nix
View file

@ -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 {