diff options
author | Weijia Wang <9713184+wegank@users.noreply.github.com> | 2023-03-06 23:58:24 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-03-06 23:58:24 +0200 |
commit | da72539659f6847022f192a407981c783d74d876 (patch) | |
tree | 6555328c4fda2628182c80435a6e4f05ab2f0586 | |
parent | 87eb883435f47830696ae868fdf861a5d1270b29 (diff) | |
parent | 9b985ffb118dc36281b728570c1bc77ca4bd9ef4 (diff) |
Merge pull request #219881 from wegank/weidu-ocaml
weidu: patch against OCaml 4.14
-rw-r--r-- | pkgs/tools/games/weidu/default.nix | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/pkgs/tools/games/weidu/default.nix b/pkgs/tools/games/weidu/default.nix index 91c6217d893a..f63e5d41d3fe 100644 --- a/pkgs/tools/games/weidu/default.nix +++ b/pkgs/tools/games/weidu/default.nix @@ -9,10 +9,10 @@ }: let - # 1. Needs ocaml >= 4.04 and <= 4.11 + # 1. Needs ocaml >= 4.04 and <= 4.11 (patched against 4.14) # 2. ocaml 4.10 defaults to safe (immutable) strings so we need a version with # that disabled as weidu is strongly dependent on mutable strings - ocaml' = ocaml-ng.ocamlPackages_4_11.ocaml.override { + ocaml' = ocaml-ng.ocamlPackages_4_14.ocaml.override { unsafeStringSupport = true; }; @@ -34,6 +34,9 @@ stdenv.mkDerivation rec { --replace elkhound ${elkhound}/bin/elkhound mkdir -p obj/{.depend,x86_LINUX} + + # undefined reference to `caml_hash_univ_param' + sed -i "20,21d;s/old_hash_param/hash_param/" hashtbl-4.03.0/myhashtbl.ml ''; nativeBuildInputs = [ elkhound ocaml' perl which gnumake42 ]; |