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

Revert "coq: propagate and install ocaml and findlib"

Browse Source 
This reverts commit 5d0e2dedd5594cdf3ebbda8bc61310e227235a9c.
This commit is contained in:
Vincent Laporte 2020-10-28 17:25:40 +01:00 committed by Vincent Laporte
parent 7bee257d88
commit 8cab21b48b
1 changed files with 2 additions and 5 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 ] buildInputs = [ ncurses ocamlPackages.ocaml ocamlPackages.findlib ]
++ 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,10 +117,7 @@ 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 = [ ocamlPackages.ocaml ocamlPackages.findlib ] propagatedBuildInputs = stdenv.lib.optional (versionAtLeast "8.12") ocamlPackages.num;
++ stdenv.lib.optional (versionAtLeast "8.12") ocamlPackages.num;
propagatedUserEnvPkgs = [ ocamlPackages.ocaml ocamlPackages.findlib ];
postPatch = '' postPatch = ''
UNAME=$(type -tp uname) UNAME=$(type -tp uname)