nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-01-18 19:03:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #219881 from wegank/weidu-ocaml

Browse Source 
weidu: patch against OCaml 4.14
This commit is contained in:
Weijia Wang 2023-03-06 23:58:24 +02:00 committed by GitHub
commit da72539659
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkgs/tools/games/weidu/default.nix
View File

@ -9,10 +9,10 @@
}: }:
let 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 # 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 # 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; unsafeStringSupport = true;
}; };
@ -34,6 +34,9 @@ stdenv.mkDerivation rec {
--replace elkhound ${elkhound}/bin/elkhound --replace elkhound ${elkhound}/bin/elkhound
mkdir -p obj/{.depend,x86_LINUX} 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 ]; nativeBuildInputs = [ elkhound ocaml' perl which gnumake42 ];