diff options
| author | Théo Zimmermann <theo.zimmermann@univ-paris-diderot.fr> | 2018-10-10 17:27:19 +0200 |
|---|---|---|
| committer | Théo Zimmermann <theo.zimmermann@univ-paris-diderot.fr> | 2018-10-10 19:44:54 +0200 |
| commit | 2fdd38ed2df0f6df08154a8982c87d77b9ca7b18 (patch) | |
| tree | f9efce1d42b14e4d790c27ed59a23f94ffd98bbf /pkgs/applications/science/logic | |
| parent | eaf0de5985ef1316323c7da4026ed268399a3589 (diff) | |
| download | nixlib-2fdd38ed2df0f6df08154a8982c87d77b9ca7b18.tar nixlib-2fdd38ed2df0f6df08154a8982c87d77b9ca7b18.tar.gz nixlib-2fdd38ed2df0f6df08154a8982c87d77b9ca7b18.tar.bz2 nixlib-2fdd38ed2df0f6df08154a8982c87d77b9ca7b18.tar.lz nixlib-2fdd38ed2df0f6df08154a8982c87d77b9ca7b18.tar.xz nixlib-2fdd38ed2df0f6df08154a8982c87d77b9ca7b18.tar.zst nixlib-2fdd38ed2df0f6df08154a8982c87d77b9ca7b18.zip | |
camlp5_transitional: remove in favor of camlp5 (strict)
Diffstat (limited to 'pkgs/applications/science/logic')
| -rw-r--r-- | pkgs/applications/science/logic/coq/default.nix | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/pkgs/applications/science/logic/coq/default.nix b/pkgs/applications/science/logic/coq/default.nix index 0ede4230aa6d..23f1ff85edf0 100644 --- a/pkgs/applications/science/logic/coq/default.nix +++ b/pkgs/applications/science/logic/coq/default.nix @@ -27,7 +27,6 @@ let "8.8.2" = "1lip3xja924dm6qblisk1bk0x8ai24s5xxqxphbdxj6djglj68fd"; }."${version}"; coq-version = builtins.substring 0 3 version; - camlp5 = ocamlPackages.camlp5_strict; ideFlags = if buildIde then "-lablgtkdir ${ocamlPackages.lablgtk}/lib/ocaml/*/site-lib/lablgtk2 -coqide opt" else ""; csdpPatch = if csdp != null then '' substituteInPlace plugins/micromega/sos.ml --replace "; csdp" "; ${csdp}/bin/csdp" @@ -37,8 +36,8 @@ self = stdenv.mkDerivation { name = "coq-${version}"; passthru = { - inherit coq-version camlp5; - inherit (ocamlPackages) ocaml findlib num; + inherit coq-version; + inherit (ocamlPackages) ocaml camlp5 findlib num; emacsBufferSetup = pkgs: '' ; Propagate coq paths to children (inherit-local-permanent coq-prog-name "${self}/bin/coqtop") @@ -93,7 +92,7 @@ self = stdenv.mkDerivation { }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ ocamlPackages.ocaml ocamlPackages.findlib camlp5 ncurses ocamlPackages.num ] + buildInputs = [ ncurses ] ++ (with ocamlPackages; [ ocaml findlib camlp5 num ]) ++ stdenv.lib.optional buildIde ocamlPackages.lablgtk; postPatch = '' |