diff options
| author | Vincent Laporte | 2020-08-08 06:12:09 +0200 |
|---|---|---|
| committer | Vincent Laporte | 2020-08-08 06:12:09 +0200 |
| commit | ef08abec26c2f0017d1136870f8f99144e579538 (patch) | |
| tree | f25c11cc50de7a3e680b5c9d01d9ef1f447d82c0 | |
| parent | 7427e7c5fa5312e7625ebf5243978691fdb04f92 (diff) | |
| parent | a2da87278607e149195cd9abb1dd566c1a9628f1 (diff) | |
Merge PR #12796: [default.nix] Propagate dependency on num following #12604.
Reviewed-by: vbgl
| -rw-r--r-- | default.nix | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/default.nix b/default.nix index 6b0e396d23..df1c43101b 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 ]) + ++ (with ocamlPackages; [ ocaml findlib ]) ++ optionals buildIde [ ocamlPackages.lablgtk3-sourceview3 glib gnome3.defaultIconTheme wrapGAppsHook @@ -69,6 +69,12 @@ stdenv.mkDerivation rec { ++ [ dune_2 ] # Maybe the next build system ); + # 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 + ]; + src = if shell then null else |