git.iko.soy/typeable/nixpkgs
on master help sign in
coq: propagate and install ocaml and findlib

Fix #34657.

commit5d0e2dedd5594cdf3ebbda8bc61310e227235a9c authorThéo Zimmermann <theo.zimmermann@inria.fr> dateMon 19 Oct 2020, 11:53 (6 years ago) parent9085a72
1 file changed+5−2
pkgs/applications/science/logic/coq/default.nix+5−2
pkgs/applications/science/logic/coq/default.nix+5−2
@@ -109,7 +109,7 @@ self = stdenv.mkDerivation {
109109 nativeBuildInputs = [ pkgconfig ]
110110 ++ stdenv.lib.optional (!versionAtLeast "8.6") gnumake42
111111 ;
112− buildInputs = [ ncurses ocamlPackages.ocaml ocamlPackages.findlib ]
112+ buildInputs = [ ncurses ]
113113 ++ stdenv.lib.optional (!versionAtLeast "8.10") ocamlPackages.camlp5
114114 ++ stdenv.lib.optional (!versionAtLeast "8.12") ocamlPackages.num
115115 ++ stdenv.lib.optionals buildIde
@@ -117,7 +117,10 @@ self = stdenv.mkDerivation {
117117 then [ ocamlPackages.lablgtk3-sourceview3 glib gnome3.defaultIconTheme wrapGAppsHook ]
118118 else [ ocamlPackages.lablgtk ]);
119119
120− propagatedBuildInputs = stdenv.lib.optional (versionAtLeast "8.12") ocamlPackages.num;
120+ propagatedBuildInputs = [ ocamlPackages.ocaml ocamlPackages.findlib ]
121+ ++ stdenv.lib.optional (versionAtLeast "8.12") ocamlPackages.num;
122+
123+ propagatedUserEnvPkgs = [ ocamlPackages.ocaml ocamlPackages.findlib ];
121124
122125 postPatch = ''
123126 UNAME=$(type -tp uname)