diff --git a/pkgs/tools/games/weidu/default.nix b/pkgs/tools/games/weidu/default.nix index f63e5d41d3fe..580eea067031 100644 --- a/pkgs/tools/games/weidu/default.nix +++ b/pkgs/tools/games/weidu/default.nix @@ -12,9 +12,7 @@ let # 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_14.ocaml.override { - unsafeStringSupport = true; - }; + ocaml' = ocaml-ng.ocamlPackages_4_14_unsafe_string.ocaml; in stdenv.mkDerivation rec { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5d7fa20a7195..d86808acf5d9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20193,9 +20193,7 @@ with pkgs; glpk = callPackage ../development/libraries/glpk { }; glsurf = callPackage ../applications/science/math/glsurf { - ocamlPackages = ocaml-ng.mkOcamlPackages (ocaml-ng.ocamlPackages_4_14.ocaml.override { - unsafeStringSupport = true; - }); + ocamlPackages = ocaml-ng.ocamlPackages_4_14_unsafe_string; }; glui = callPackage ../development/libraries/glui {}; @@ -31564,9 +31562,7 @@ with pkgs; mjpg-streamer = callPackage ../applications/video/mjpg-streamer { }; mldonkey = callPackage ../applications/networking/p2p/mldonkey { - ocamlPackages = ocaml-ng.mkOcamlPackages (ocaml-ng.ocamlPackages_4_14.ocaml.override { - unsafeStringSupport = true; - }); + ocamlPackages = ocaml-ng.ocamlPackages_4_14_unsafe_string; }; mlvwm = callPackage ../applications/window-managers/mlvwm { }; @@ -37104,9 +37100,7 @@ with pkgs; drat-trim = callPackage ../applications/science/logic/drat-trim {}; ekrhyper = callPackage ../applications/science/logic/ekrhyper { - ocaml = ocaml-ng.ocamlPackages_4_14.ocaml.override { - unsafeStringSupport = true; - }; + ocaml = ocaml-ng.ocamlPackages_4_14_unsafe_string.ocaml; }; eprover = callPackage ../applications/science/logic/eprover { };