diff options
| author | Théo Zimmermann <theo.zimmermann@inria.fr> | 2020-10-19 11:53:12 +0200 |
|---|---|---|
| committer | Vincent Laporte <vbgl@users.noreply.github.com> | 2020-10-21 11:07:02 +0200 |
| commit | 5d0e2dedd5594cdf3ebbda8bc61310e227235a9c (patch) | |
| tree | 7176278dd2c084a02986d506f3922282954b47c1 /pkgs/applications/science/logic | |
| parent | 9085a724fdd7668f6e59abd9dfc7aef4e1dde3dd (diff) | |
coq: propagate and install ocaml and findlib
Fix #34657.
Diffstat (limited to 'pkgs/applications/science/logic')
| -rw-r--r-- | pkgs/applications/science/logic/coq/default.nix | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/pkgs/applications/science/logic/coq/default.nix b/pkgs/applications/science/logic/coq/default.nix index 946cba41b143..9b7e007ce503 100644 --- a/pkgs/applications/science/logic/coq/default.nix +++ b/pkgs/applications/science/logic/coq/default.nix @@ -109,7 +109,7 @@ self = stdenv.mkDerivation { nativeBuildInputs = [ pkgconfig ] ++ stdenv.lib.optional (!versionAtLeast "8.6") gnumake42 ; - buildInputs = [ ncurses ocamlPackages.ocaml ocamlPackages.findlib ] + buildInputs = [ ncurses ] ++ stdenv.lib.optional (!versionAtLeast "8.10") ocamlPackages.camlp5 ++ stdenv.lib.optional (!versionAtLeast "8.12") ocamlPackages.num ++ stdenv.lib.optionals buildIde @@ -117,7 +117,10 @@ self = stdenv.mkDerivation { then [ ocamlPackages.lablgtk3-sourceview3 glib gnome3.defaultIconTheme wrapGAppsHook ] else [ ocamlPackages.lablgtk ]); - propagatedBuildInputs = stdenv.lib.optional (versionAtLeast "8.12") ocamlPackages.num; + propagatedBuildInputs = [ ocamlPackages.ocaml ocamlPackages.findlib ] + ++ stdenv.lib.optional (versionAtLeast "8.12") ocamlPackages.num; + + propagatedUserEnvPkgs = [ ocamlPackages.ocaml ocamlPackages.findlib ]; postPatch = '' UNAME=$(type -tp uname) |