diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2020-10-22 21:20:32 +0200 |
|---|---|---|
| committer | Jan Tojnar <jtojnar@gmail.com> | 2020-10-22 21:20:32 +0200 |
| commit | 3e01d383eed06fd4d86ea9385a2795000baab80c (patch) | |
| tree | 5d801faa946b7116ac69e865f90ef1623e7cb7d8 /pkgs/applications/science/logic | |
| parent | e22e6d763a2dd6c73131820a0fbff817d393d7a4 (diff) | |
| parent | d13fc932cd213b2f7d50094fdcf7ef9b2e8439ab (diff) | |
Merge branch 'staging-next' into staging
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) |