From 40932770fb1d5700f094954b15a6d84aaa007385 Mon Sep 17 00:00:00 2001 From: Théo Zimmermann Date: Fri, 11 Sep 2020 16:58:09 +0200 Subject: Propagate zarith dependency. External plugins need the OCaml dependencies of Coq in scope because ocamlfind looks for them since #12604. --- default.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/default.nix b/default.nix index ef969acd31..e383d214e0 100644 --- a/default.nix +++ b/default.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { hostname python3 time # coq-makefile timing tools ] - ++ (with ocamlPackages; [ ocaml findlib num zarith ]) + ++ (with ocamlPackages; [ ocaml findlib ]) ++ optionals buildIde [ ocamlPackages.lablgtk3-sourceview3 glib gnome3.defaultIconTheme wrapGAppsHook @@ -71,9 +71,8 @@ stdenv.mkDerivation rec { # Since #12604, ocamlfind looks for num when building plugins # This follows a similar change in the nixpkgs repo (cf. NixOS/nixpkgs#94230) - propagatedBuildInputs = [ - ocamlPackages.num - ]; + # Same for zarith which is needed since its introduction as a dependency of Coq + propagatedBuildInputs = with ocamlPackages; [ num zarith ]; src = if shell then null -- cgit v1.2.3