diff options
| author | Vincent Laporte | 2020-10-22 13:36:29 +0200 |
|---|---|---|
| committer | Vincent Laporte | 2020-10-22 13:36:29 +0200 |
| commit | 0d45ff2d002cb51046a34bb05dc34a67d5dab3cf (patch) | |
| tree | b542173792cbde8db0165bf078c031dee6921b63 /default.nix | |
| parent | 7118100aafd5b65d38ef3301afcb5b3e72889d19 (diff) | |
| parent | a2ee2a6eabe41cd62fcae720f3ee9abd61eb1eb9 (diff) | |
Merge PR #13245: [default.nix] Propagate OCaml and findlib to user env.
Reviewed-by: vbgl
Diffstat (limited to 'default.nix')
| -rw-r--r-- | default.nix | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/default.nix b/default.nix index ffee77f1f7..7f9e62b28c 100644 --- a/default.nix +++ b/default.nix @@ -43,7 +43,6 @@ stdenv.mkDerivation rec { hostname python3 time # coq-makefile timing tools ] - ++ (with ocamlPackages; [ ocaml findlib ]) ++ optionals buildIde [ ocamlPackages.lablgtk3-sourceview3 glib gnome3.defaultIconTheme wrapGAppsHook @@ -69,10 +68,13 @@ stdenv.mkDerivation rec { ++ [ dune_2 ] # Maybe the next build system ); - # Since #12604, ocamlfind looks for num when building plugins + # OCaml and findlib are needed so that native_compute works + # This follows a similar change in the nixpkgs repo (cf. NixOS/nixpkgs#101058) + # ocamlfind looks for zarith when building plugins # This follows a similar change in the nixpkgs repo (cf. NixOS/nixpkgs#94230) - # Same for zarith which is needed since its introduction as a dependency of Coq - propagatedBuildInputs = with ocamlPackages; [ zarith ]; + propagatedBuildInputs = with ocamlPackages; [ ocaml findlib zarith ]; + + propagatedUserEnvPkgs = with ocamlPackages; [ ocaml findlib ]; src = if shell then null |