diff options
| author | Vincent Laporte <vbgl@users.noreply.github.com> | 2022-05-13 06:47:14 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-05-13 06:47:14 +0200 |
| commit | 1f11888116d74b814acd1071a2f49523bf2a4aa7 (patch) | |
| tree | 0c32d4aa2f6a64762b18860aa6dc2a780b2209b8 /pkgs/applications/science/logic/coq | |
| parent | 215235cce56b0a7322d52e6a94e65ec59dc83b7d (diff) | |
Revert "coqPackages: etc"
This reverts commit 7e589a45ef86abf9a6a737d9730925b81ee663b4.
Diffstat (limited to 'pkgs/applications/science/logic/coq')
| -rw-r--r-- | pkgs/applications/science/logic/coq/default.nix | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/pkgs/applications/science/logic/coq/default.nix b/pkgs/applications/science/logic/coq/default.nix index 58edf0a0039a4..c078287b85ee3 100644 --- a/pkgs/applications/science/logic/coq/default.nix +++ b/pkgs/applications/science/logic/coq/default.nix @@ -70,9 +70,9 @@ let { case = range "8.7" "8.10"; out = ocamlPackages_4_09; } { case = range "8.5" "8.6"; out = ocamlPackages_4_05; } ] ocamlPackages_4_12; - ocamlNativeBuildInputs = [ ocamlPackages.ocaml ] + ocamlNativeBuildInputs = [ ocamlPackages.ocaml ocamlPackages.findlib ] ++ optional (coqAtLeast "8.14") ocamlPackages.dune_2; - ocamlBuildInputs = [ ocamlPackages.findlib ] + ocamlBuildInputs = [] ++ optional (!coqAtLeast "8.10") ocamlPackages.camlp5 ++ optional (!coqAtLeast "8.13") ocamlPackages.num ++ optional (coqAtLeast "8.13") ocamlPackages.zarith; @@ -136,15 +136,13 @@ self = stdenv.mkDerivation { ++ optional buildIde copyDesktopItems ++ optional (buildIde && coqAtLeast "8.10") wrapGAppsHook ++ optional (!coqAtLeast "8.6") gnumake42; - buildInputs = [ ncurses ] + buildInputs = [ ncurses ] ++ ocamlBuildInputs ++ optionals buildIde (if coqAtLeast "8.10" then [ ocamlPackages.lablgtk3-sourceview3 glib gnome.adwaita-icon-theme ] else [ ocamlPackages.lablgtk ]) ; - propagatedBuildInputs = ocamlBuildInputs; - postPatch = '' UNAME=$(type -tp uname) RM=$(type -tp rm) |