diff options
| author | Thomas Gerbet <thomas@gerbet.me> | 2022-05-13 10:53:28 +0200 |
|---|---|---|
| committer | Vincent Laporte <vbgl@users.noreply.github.com> | 2022-05-13 14:27:50 +0200 |
| commit | fffbc708f04c9fdcaa1882df9085c5d343d1b9c2 (patch) | |
| tree | 2434c46778b54e2b15a2272f5a9caa48dc4c73ed /pkgs/applications/networking/p2p | |
| parent | a4dd566f2c2afe5353ab24efec83cd52b6227c3e (diff) | |
mldonkey: fix the build
This fixes the build by pulling a patch currently under review. This patch is also currently used by Gentoo.
Diffstat (limited to 'pkgs/applications/networking/p2p')
| -rw-r--r-- | pkgs/applications/networking/p2p/mldonkey/default.nix | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/pkgs/applications/networking/p2p/mldonkey/default.nix b/pkgs/applications/networking/p2p/mldonkey/default.nix index 41b8a7d0b6c2e..374f2419b96d4 100644 --- a/pkgs/applications/networking/p2p/mldonkey/default.nix +++ b/pkgs/applications/networking/p2p/mldonkey/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, ocamlPackages, zlib }: +{ lib, stdenv, fetchurl, fetchpatch, ocamlPackages, zlib }: stdenv.mkDerivation rec { pname = "mldonkey"; @@ -9,6 +9,14 @@ stdenv.mkDerivation rec { sha256 = "b926e7aa3de4b4525af73c88f1724d576b4add56ef070f025941dd51cb24a794"; }; + patches = [ + # Fixes C++17 compat + (fetchpatch { + url = "https://github.com/ygrek/mldonkey/pull/66/commits/20ff84c185396f3d759cf4ef46b9f0bd33a51060.patch"; + hash = "sha256-MCqx0jVfOaLkZhhv0b1cTdO6BK2/f6TxTWmx+NZjXME="; + }) + ]; + preConfigure = '' substituteInPlace Makefile --replace '+camlp4' \ '${ocamlPackages.camlp4}/lib/ocaml/${ocamlPackages.ocaml.version}/site-lib/camlp4' |