diff options
author | rht <rhtbot@gmail.com> | 2017-01-15 18:21:57 +0400 |
---|---|---|
committer | rht <rhtbot@gmail.com> | 2017-03-18 01:51:37 +0300 |
commit | 7264efb5cb387ada5e739ec35d4b48db1904705b (patch) | |
tree | d7817ace7ede959483155be4b38e14fd25a2b69d /pkgs/applications/science | |
parent | 975d040f07eff23289e7698cb4bf02461c3fdd19 (diff) | |
download | nixlib-7264efb5cb387ada5e739ec35d4b48db1904705b.tar nixlib-7264efb5cb387ada5e739ec35d4b48db1904705b.tar.gz nixlib-7264efb5cb387ada5e739ec35d4b48db1904705b.tar.bz2 nixlib-7264efb5cb387ada5e739ec35d4b48db1904705b.tar.lz nixlib-7264efb5cb387ada5e739ec35d4b48db1904705b.tar.xz nixlib-7264efb5cb387ada5e739ec35d4b48db1904705b.tar.zst nixlib-7264efb5cb387ada5e739ec35d4b48db1904705b.zip |
Fold in specific ocaml version choice into let
Diffstat (limited to 'pkgs/applications/science')
-rw-r--r-- | pkgs/applications/science/logic/coq/HEAD.nix | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/pkgs/applications/science/logic/coq/HEAD.nix b/pkgs/applications/science/logic/coq/HEAD.nix index e02170793eaf..79893c38997f 100644 --- a/pkgs/applications/science/logic/coq/HEAD.nix +++ b/pkgs/applications/science/logic/coq/HEAD.nix @@ -1,26 +1,29 @@ -# - coqide compilation can be disabled by setting lablgtk to null; +# - coqide compilation can be disabled by setting buildIde to false; # - The csdp program used for the Micromega tactic is statically referenced. # However, coq can build without csdp by setting it to null. # In this case some Micromega tactics will search the user's path for the csdp program and will fail if it is not found. -{stdenv, fetchgit, writeText, pkgconfig, ocaml, findlib, camlp5, ncurses, lablgtk ? null, csdp ? null}: +{stdenv, fetchgit, writeText, pkgconfig, ocamlPackages_4_02, ncurses, buildIde ? true, csdp ? null}: let version = "2017-01-22"; coq-version = "8.6"; - buildIde = lablgtk != null; - ideFlags = if buildIde then "-lablgtkdir ${lablgtk}/lib/ocaml/*/site-lib/lablgtk2 -coqide opt" else ""; + ideFlags = if buildIde then "-lablgtkdir ${ocamlPackages_4_02.lablgtk}/lib/ocaml/*/site-lib/lablgtk2 -coqide opt" else ""; csdpPatch = if csdp != null then '' substituteInPlace plugins/micromega/sos.ml --replace "; csdp" "; ${csdp}/bin/csdp" substituteInPlace plugins/micromega/coq_micromega.ml --replace "System.is_in_system_path \"csdp\"" "true" '' else ""; + ocaml = ocamlPackages_4_02.ocaml; + findlib = ocamlPackages_4_02.findlib; + lablgtk = ocamlPackages_4_02.lablgtk; + camlp5 = ocamlPackages_4_02.camlp5_transitional; in stdenv.mkDerivation { name = "coq-unstable-${version}"; inherit coq-version; - inherit ocaml camlp5; + inherit ocaml camlp5 findlib; src = fetchgit { url = git://scm.gforge.inria.fr/coq/coq.git; |