Merge pull request #219883 from wegank/mldonkey-ocaml
mldonkey: migrate to OCaml 4.14
This commit is contained in:
commit
87eb883435
2 changed files with 7 additions and 2 deletions
pkgs
|
@ -20,6 +20,11 @@ stdenv.mkDerivation rec {
|
||||||
url = "https://github.com/ygrek/mldonkey/commit/a153f0f7a4826d86d51d4bacedc0330b70fcbc34.patch";
|
url = "https://github.com/ygrek/mldonkey/commit/a153f0f7a4826d86d51d4bacedc0330b70fcbc34.patch";
|
||||||
hash = "sha256-/Muk3mPFjQJ48FqaozGa7o8YSPhDLXRz9K1EyfxlzC8=";
|
hash = "sha256-/Muk3mPFjQJ48FqaozGa7o8YSPhDLXRz9K1EyfxlzC8=";
|
||||||
})
|
})
|
||||||
|
# Fixes OCaml 4.14 compat
|
||||||
|
(fetchpatch {
|
||||||
|
url = "https://github.com/FabioLolix/AUR-artifacts/raw/6721c2d4ef0be9a99499ecf2787e378e50b915e9/mldonkey-fix-build.patch";
|
||||||
|
hash = "sha256-HPW/CKfhywy+Km5/64Iok4tO9LJjAk53jVlsYzIRPfs=";
|
||||||
|
})
|
||||||
];
|
];
|
||||||
|
|
||||||
preConfigure = ''
|
preConfigure = ''
|
||||||
|
@ -28,7 +33,7 @@ stdenv.mkDerivation rec {
|
||||||
'';
|
'';
|
||||||
|
|
||||||
strictDeps = true;
|
strictDeps = true;
|
||||||
nativeBuildInputs = with ocamlPackages; [ ocaml camlp4];
|
nativeBuildInputs = with ocamlPackages; [ ocaml camlp4 ];
|
||||||
buildInputs = (with ocamlPackages; [ num ]) ++ [ zlib ];
|
buildInputs = (with ocamlPackages; [ num ]) ++ [ zlib ];
|
||||||
|
|
||||||
meta = {
|
meta = {
|
||||||
|
|
|
@ -31564,7 +31564,7 @@ with pkgs;
|
||||||
mjpg-streamer = callPackage ../applications/video/mjpg-streamer { };
|
mjpg-streamer = callPackage ../applications/video/mjpg-streamer { };
|
||||||
|
|
||||||
mldonkey = callPackage ../applications/networking/p2p/mldonkey {
|
mldonkey = callPackage ../applications/networking/p2p/mldonkey {
|
||||||
ocamlPackages = ocaml-ng.mkOcamlPackages (ocaml-ng.ocamlPackages_4_13.ocaml.override {
|
ocamlPackages = ocaml-ng.mkOcamlPackages (ocaml-ng.ocamlPackages_4_14.ocaml.override {
|
||||||
unsafeStringSupport = true;
|
unsafeStringSupport = true;
|
||||||
});
|
});
|
||||||
};
|
};
|
||||||
|
|
Loading…
Reference in a new issue