Coq: adapt for upcoming 8.14 (#128603)

3 years ago · d3bb50e7da
parent bfc605bf91
commit d3bb50e7da
1 changed files with 4 additions and 3 deletions
--- a/pkgs/applications/science/logic/coq/default.nix
+++ b/pkgs/applications/science/logic/coq/default.nix
@ -129,14 +129,15 @@ self = stdenv.mkDerivation {
    ++ optionals buildIde
      (if versionAtLeast "8.10"
       then [ ocamlPackages.lablgtk3-sourceview3 glib gnome.adwaita-icon-theme wrapGAppsHook ]
-       else [ ocamlPackages.lablgtk ]);
+       else [ ocamlPackages.lablgtk ])
+    ++ optional (versionAtLeast "8.14") [ ocamlPackages.dune_2 ]
+  ;

  postPatch = ''
    UNAME=$(type -tp uname)
    RM=$(type -tp rm)
-    substituteInPlace configure --replace "/bin/uname" "$UNAME"
    substituteInPlace tools/beautify-archive --replace "/bin/rm" "$RM"
-    substituteInPlace configure.ml --replace '"md5 -q"' '"md5sum"'
+    ${if !versionAtLeast "8.7" then "substituteInPlace configure.ml --replace \"md5 -q\" \"md5sum\"" else ""}
    ${csdpPatch}
  '';