diff options
| author | Vincent Laporte <Vincent.Laporte@gmail.com> | 2017-07-08 15:21:42 +0200 |
|---|---|---|
| committer | Vincent Laporte <Vincent.Laporte@gmail.com> | 2017-07-08 15:21:42 +0200 |
| commit | 3a227e673abc5935f3aaa7a7350da54f52172924 (patch) | |
| tree | 70e3843af0971b5c88ed9fd9b1f192192aec163d | |
| parent | 4a3e1d83a15375056562ce4cf4599913d79479fc (diff) | |
| download | nixlib-3a227e673abc5935f3aaa7a7350da54f52172924.tar nixlib-3a227e673abc5935f3aaa7a7350da54f52172924.tar.gz nixlib-3a227e673abc5935f3aaa7a7350da54f52172924.tar.bz2 nixlib-3a227e673abc5935f3aaa7a7350da54f52172924.tar.lz nixlib-3a227e673abc5935f3aaa7a7350da54f52172924.tar.xz nixlib-3a227e673abc5935f3aaa7a7350da54f52172924.tar.zst nixlib-3a227e673abc5935f3aaa7a7350da54f52172924.zip | |
mldonkey: 3.1.5 -> 3.1.6
| -rw-r--r-- | pkgs/applications/networking/p2p/mldonkey/default.nix | 18 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
2 files changed, 13 insertions, 9 deletions
diff --git a/pkgs/applications/networking/p2p/mldonkey/default.nix b/pkgs/applications/networking/p2p/mldonkey/default.nix index 416995f120c5..629e748fcacf 100644 --- a/pkgs/applications/networking/p2p/mldonkey/default.nix +++ b/pkgs/applications/networking/p2p/mldonkey/default.nix @@ -1,14 +1,20 @@ -{stdenv, fetchurl, ocaml, zlib, bzip2, ncurses, file, gd, libpng, libjpeg }: +{ stdenv, fetchurl, ocamlPackages, zlib, bzip2, ncurses, file, gd, libpng, libjpeg }: stdenv.mkDerivation (rec { - name = "mldonkey-3.1.5"; + name = "mldonkey-3.1.6"; src = fetchurl { - url = "mirror://sourceforge/mldonkey/${name}.tar.bz2"; - sha256 = "1jqik6b09p27ckssppfiqpph7alxbgpnf9w1s0lalmi3qyyd9ybl"; + url = https://github.com/ygrek/mldonkey/releases/download/release-3-1-6/mldonkey-3.1.6.tar.bz2; + sha256 = "0g84islkj72ymp0zzppcj9n4r21h0vlghnq87hv2wg580mybadhv"; }; - buildInputs = [ ocaml zlib ncurses bzip2 file gd libpng libjpeg ]; + preConfigure = stdenv.lib.optionalString (ocamlPackages.camlp4 != null) '' + substituteInPlace Makefile --replace '+camlp4' \ + '${ocamlPackages.camlp4}/lib/ocaml/${ocamlPackages.ocaml.version}/site-lib/camlp4' + ''; + + buildInputs = [ zlib ncurses bzip2 file gd libpng libjpeg ] ++ + (with ocamlPackages; [ ocaml camlp4 ]); configureFlags = [ "--disable-gui" ]; meta = { @@ -17,7 +23,7 @@ stdenv.mkDerivation (rec { license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.unix; }; -} // (if !ocaml.nativeCompilers then +} // (if !ocamlPackages.ocaml.nativeCompilers then { # Byte code compilation (the ocaml opt compiler is not supported in some platforms) buildPhase = "make mlnet.byte"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index aa97f4d3087f..f49741b320b3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15063,9 +15063,7 @@ with pkgs; mjpg-streamer = callPackage ../applications/video/mjpg-streamer { }; - mldonkey = callPackage ../applications/networking/p2p/mldonkey { - ocaml = ocamlPackages_4_01_0.ocaml; - }; + mldonkey = callPackage ../applications/networking/p2p/mldonkey { }; MMA = callPackage ../applications/audio/MMA { }; |