diff options
| author | Vincent Laporte | 2020-09-16 14:49:06 +0200 |
|---|---|---|
| committer | Vincent Laporte | 2020-09-16 14:49:06 +0200 |
| commit | 95f78398bbfe32d55dc07e7ef1a4dc61b7b80cfd (patch) | |
| tree | c4a614dc00ec3855462b5030775d4ef3e5faa29f | |
| parent | 7edb2d353fc566eafd4cf6d8268271918ded321d (diff) | |
| parent | 40932770fb1d5700f094954b15a6d84aaa007385 (diff) | |
Merge PR #13015: Propagate zarith dependency.
Reviewed-by: vbgl
| -rw-r--r-- | default.nix | 7 |
1 files 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 |