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/development/coq-modules/compcert | |
| parent | 215235cce56b0a7322d52e6a94e65ec59dc83b7d (diff) | |
Revert "coqPackages: etc"
This reverts commit 7e589a45ef86abf9a6a737d9730925b81ee663b4.
Diffstat (limited to 'pkgs/development/coq-modules/compcert')
| -rw-r--r-- | pkgs/development/coq-modules/compcert/default.nix | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/pkgs/development/coq-modules/compcert/default.nix b/pkgs/development/coq-modules/compcert/default.nix index 5d2eb4433e6b1..092bb58d174fa 100644 --- a/pkgs/development/coq-modules/compcert/default.nix +++ b/pkgs/development/coq-modules/compcert/default.nix @@ -1,5 +1,5 @@ { lib, fetchzip, mkCoqDerivation, coq, flocq, compcert -, fetchpatch, makeWrapper, coq2html +, ocamlPackages, fetchpatch, makeWrapper, coq2html , stdenv, tools ? stdenv.cc , version ? null }: @@ -15,9 +15,9 @@ let compcert = mkCoqDerivation rec { releaseRev = v: "v${v}"; defaultVersion = with versions; switch coq.version [ - { case = range "8.13" "8.15"; out = "3.10"; } - { case = isEq "8.12" ; out = "3.9"; } { case = range "8.8" "8.11"; out = "3.8"; } + { case = isEq "8.12" ; out = "3.9"; } + { case = range "8.12" "8.15"; out = "3.10"; } ] null; release = { @@ -26,9 +26,8 @@ let compcert = mkCoqDerivation rec { "3.10".sha256 = "sha256:19rmx8r8v46101ij5myfrz60arqjy7q3ra3fb8mxqqi3c8c4l4j6"; }; - mlPlugin = true; nativeBuildInputs = [ makeWrapper ]; - buildInputs = with coq.ocamlPackages; [ menhir menhirLib ] ++ [ coq2html ]; + buildInputs = with ocamlPackages; [ ocaml findlib menhir menhirLib ] ++ [ coq coq2html ]; propagatedBuildInputs = [ flocq ]; enableParallelBuilding = true; @@ -49,13 +48,9 @@ let compcert = mkCoqDerivation rec { ''; installTargets = "documentation install"; - installFlags = []; # trust ./configure - preInstall = '' - mkdir -p $out/share/man - mkdir -p $man/share - ''; postInstall = '' # move man into place + mkdir -p $man/share mv $out/share/man/ $man/share/ # move docs into place |