From d3bb50e7da2a6ef9745344d251b435e1191fa831 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Th=C3=A9o=20Zimmermann?= Date: Wed, 30 Jun 2021 04:47:31 +0200 Subject: [PATCH] Coq: adapt for upcoming 8.14 (#128603) --- pkgs/applications/science/logic/coq/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/science/logic/coq/default.nix b/pkgs/applications/science/logic/coq/default.nix index 9d6212fef112..69753fcef2d0 100644 --- 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} '';