From 8cab21b48b46086d5240dcee4dd018cb4a78c074 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Wed, 28 Oct 2020 17:25:40 +0100 Subject: [PATCH] Revert "coq: propagate and install ocaml and findlib" This reverts commit 5d0e2dedd5594cdf3ebbda8bc61310e227235a9c. --- pkgs/applications/science/logic/coq/default.nix | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/science/logic/coq/default.nix b/pkgs/applications/science/logic/coq/default.nix index 9b7e007ce50..946cba41b14 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 ] + buildInputs = [ ncurses ocamlPackages.ocaml ocamlPackages.findlib ] ++ stdenv.lib.optional (!versionAtLeast "8.10") ocamlPackages.camlp5 ++ stdenv.lib.optional (!versionAtLeast "8.12") ocamlPackages.num ++ stdenv.lib.optionals buildIde @@ -117,10 +117,7 @@ self = stdenv.mkDerivation { then [ ocamlPackages.lablgtk3-sourceview3 glib gnome3.defaultIconTheme wrapGAppsHook ] else [ ocamlPackages.lablgtk ]); - propagatedBuildInputs = [ ocamlPackages.ocaml ocamlPackages.findlib ] - ++ stdenv.lib.optional (versionAtLeast "8.12") ocamlPackages.num; - - propagatedUserEnvPkgs = [ ocamlPackages.ocaml ocamlPackages.findlib ]; + propagatedBuildInputs = stdenv.lib.optional (versionAtLeast "8.12") ocamlPackages.num; postPatch = '' UNAME=$(type -tp uname)