Coq: adapt for upcoming 8.14 (#128603)
This commit is contained in:
parent
bfc605bf91
commit
d3bb50e7da
1 changed files with 4 additions and 3 deletions
|
@ -129,14 +129,15 @@ self = stdenv.mkDerivation {
|
||||||
++ optionals buildIde
|
++ optionals buildIde
|
||||||
(if versionAtLeast "8.10"
|
(if versionAtLeast "8.10"
|
||||||
then [ ocamlPackages.lablgtk3-sourceview3 glib gnome.adwaita-icon-theme wrapGAppsHook ]
|
then [ ocamlPackages.lablgtk3-sourceview3 glib gnome.adwaita-icon-theme wrapGAppsHook ]
|
||||||
else [ ocamlPackages.lablgtk ]);
|
else [ ocamlPackages.lablgtk ])
|
||||||
|
++ optional (versionAtLeast "8.14") [ ocamlPackages.dune_2 ]
|
||||||
|
;
|
||||||
|
|
||||||
postPatch = ''
|
postPatch = ''
|
||||||
UNAME=$(type -tp uname)
|
UNAME=$(type -tp uname)
|
||||||
RM=$(type -tp rm)
|
RM=$(type -tp rm)
|
||||||
substituteInPlace configure --replace "/bin/uname" "$UNAME"
|
|
||||||
substituteInPlace tools/beautify-archive --replace "/bin/rm" "$RM"
|
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}
|
${csdpPatch}
|
||||||
'';
|
'';
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue