public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

coq: propagate and install ocaml and findlib 

Fix #34657.
This commit is contained in:
Théo Zimmermann 2020-10-19 11:53:12 +02:00 committed by Vincent Laporte
parent 9085a724fd
commit 5d0e2dedd5
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkgs/applications/science/logic/coq/default.nix
View File

@ -109,7 +109,7 @@ self = stdenv.mkDerivation {
nativeBuildInputs = [ pkgconfig ] nativeBuildInputs = [ pkgconfig ]
++ stdenv.lib.optional (!versionAtLeast "8.6") gnumake42 ++ 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.10") ocamlPackages.camlp5
++ stdenv.lib.optional (!versionAtLeast "8.12") ocamlPackages.num ++ stdenv.lib.optional (!versionAtLeast "8.12") ocamlPackages.num
++ stdenv.lib.optionals buildIde ++ stdenv.lib.optionals buildIde
@ -117,7 +117,10 @@ self = stdenv.mkDerivation {
then [ ocamlPackages.lablgtk3-sourceview3 glib gnome3.defaultIconTheme wrapGAppsHook ] then [ ocamlPackages.lablgtk3-sourceview3 glib gnome3.defaultIconTheme wrapGAppsHook ]
else [ ocamlPackages.lablgtk ]); 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 = '' postPatch = ''
UNAME=$(type -tp uname) UNAME=$(type -tp uname)