From 1292f49a3777d7c1bcdbc2c9f320d15921d74503 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Mon, 7 Oct 2019 08:17:33 +0000 Subject: [PATCH] =?UTF-8?q?coq=5F8=5F10:=20do=20not=20take=20=E2=80=9Ccaml?= =?UTF-8?q?p5=E2=80=9D=20as=20input?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/applications/science/logic/coq/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/science/logic/coq/default.nix b/pkgs/applications/science/logic/coq/default.nix index 86421e3adf5..9eb32a33d5d 100644 --- a/pkgs/applications/science/logic/coq/default.nix +++ b/pkgs/applications/science/logic/coq/default.nix @@ -102,7 +102,9 @@ self = stdenv.mkDerivation { }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ ncurses ] ++ (with ocamlPackages; [ ocaml findlib camlp5 num ]) + buildInputs = [ ncurses ocamlPackages.ocaml ocamlPackages.findlib ] + ++ stdenv.lib.optional (!versionAtLeast "8.10") ocamlPackages.camlp5 + ++ [ ocamlPackages.num ] ++ stdenv.lib.optionals buildIde (if versionAtLeast "8.10" then [ ocamlPackages.lablgtk3-sourceview3 glib gnome3.defaultIconTheme wrapGAppsHook ]