diff options
| author | Théo Zimmermann | 2020-08-07 15:37:45 +0200 |
|---|---|---|
| committer | Théo Zimmermann | 2020-08-07 15:37:45 +0200 |
| commit | a2da87278607e149195cd9abb1dd566c1a9628f1 (patch) | |
| tree | 7a0c30af7558406c1f30af295ff61ead8ce1ee13 /default.nix | |
| parent | 51ecccef0308eceec1ddd9776a03fd993b3ea71a (diff) | |
[default.nix] Propagate dependency on num following #12604.
Since this PR, ocamlfind looks for num when building plugins.
To avoid requiring all plugins to add a new, irrelevant, dependency, we propagate it.
This solution imitates what was decided for nixpkgs in NixOS/nixpkgs#94230.
Fix coq-community/aac-tactics#61.
Diffstat (limited to 'default.nix')
| -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 |