diff options
author | Cyril Cohen <cohen@crans.org> | 2021-02-19 19:34:30 +0100 |
---|---|---|
committer | Vincent Laporte <vbgl@users.noreply.github.com> | 2022-05-25 20:00:25 +0200 |
commit | d113661156581c835df4fe5521ffc64128772f18 (patch) | |
tree | 86aca8a3aa196d7bfc28dc28cb213262355c4c1c /pkgs/development/coq-modules/compcert/default.nix | |
parent | 41a7a6caabeed1bfd596ac7accb88a7d4e1d189a (diff) | |
download | nixpkgs-d113661156581c835df4fe5521ffc64128772f18.tar nixpkgs-d113661156581c835df4fe5521ffc64128772f18.tar.gz nixpkgs-d113661156581c835df4fe5521ffc64128772f18.tar.bz2 nixpkgs-d113661156581c835df4fe5521ffc64128772f18.tar.lz nixpkgs-d113661156581c835df4fe5521ffc64128772f18.tar.xz nixpkgs-d113661156581c835df4fe5521ffc64128772f18.tar.zst nixpkgs-d113661156581c835df4fe5521ffc64128772f18.zip |
coqPackages: etc
- put `findlib` in `buildInputs` of `mkCoqDerivation` to make sure `coq` packages find their ocaml plugin dependencies, - use `propagatedBuildInputs` to make sure ocaml plugin dependencies are in path, - updated `coqPackage.heq` (broken url), - fixed use of `DESTDIR` and `COQMF_COQLIB` in mkCoqDerivation, - adding `COQCORELIB` environement variable to put ocaml plugin files in the right place, - make `metaFetch` available from `coqPackages`
Diffstat (limited to 'pkgs/development/coq-modules/compcert/default.nix')
-rw-r--r-- | pkgs/development/coq-modules/compcert/default.nix | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/pkgs/development/coq-modules/compcert/default.nix b/pkgs/development/coq-modules/compcert/default.nix index 092bb58d174..847ef8af23f 100644 --- a/pkgs/development/coq-modules/compcert/default.nix +++ b/pkgs/development/coq-modules/compcert/default.nix @@ -1,4 +1,5 @@ -{ lib, fetchzip, mkCoqDerivation, coq, flocq, compcert +{ lib, fetchzip, mkCoqDerivation +, coq, flocq, compcert , ocamlPackages, fetchpatch, makeWrapper, coq2html , stdenv, tools ? stdenv.cc , version ? null @@ -15,9 +16,9 @@ let compcert = mkCoqDerivation rec { releaseRev = v: "v${v}"; defaultVersion = with versions; switch coq.version [ - { case = range "8.8" "8.11"; out = "3.8"; } + { case = range "8.13" "8.15"; out = "3.10"; } { case = isEq "8.12" ; out = "3.9"; } - { case = range "8.12" "8.15"; out = "3.10"; } + { case = range "8.8" "8.11"; out = "3.8"; } ] null; release = { @@ -48,9 +49,13 @@ 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 |