diff options
| author | Vincent Laporte <Vincent.Laporte@gmail.com> | 2015-09-23 19:04:51 +0200 |
|---|---|---|
| committer | Vincent Laporte <Vincent.Laporte@gmail.com> | 2015-09-23 19:04:51 +0200 |
| commit | 9a1245280d4d4f5fb0263bca41063e5901afcc62 (patch) | |
| tree | c6d4dca8695f1a9c74d06c28a0a59990d6a22973 /pkgs/applications/science | |
| parent | 272cd6f7821ed3421cb7642d1967b55372f6e10e (diff) | |
| download | nixlib-9a1245280d4d4f5fb0263bca41063e5901afcc62.tar nixlib-9a1245280d4d4f5fb0263bca41063e5901afcc62.tar.gz nixlib-9a1245280d4d4f5fb0263bca41063e5901afcc62.tar.bz2 nixlib-9a1245280d4d4f5fb0263bca41063e5901afcc62.tar.lz nixlib-9a1245280d4d4f5fb0263bca41063e5901afcc62.tar.xz nixlib-9a1245280d4d4f5fb0263bca41063e5901afcc62.tar.zst nixlib-9a1245280d4d4f5fb0263bca41063e5901afcc62.zip | |
hol_light: add support for camlp5 > 6.12
Diffstat (limited to 'pkgs/applications/science')
| -rw-r--r-- | pkgs/applications/science/logic/hol_light/Makefile.patch | 13 | ||||
| -rw-r--r-- | pkgs/applications/science/logic/hol_light/default.nix | 2 |
2 files changed, 15 insertions, 0 deletions
diff --git a/pkgs/applications/science/logic/hol_light/Makefile.patch b/pkgs/applications/science/logic/hol_light/Makefile.patch new file mode 100644 index 000000000000..2cb05f27a4f6 --- /dev/null +++ b/pkgs/applications/science/logic/hol_light/Makefile.patch @@ -0,0 +1,13 @@ +Index: Makefile +=================================================================== +--- a/Makefile (révision 199) ++++ b/Makefile (copie de travail) +@@ -59,7 +59,7 @@ + then cp pa_j_3.1x_6.02.1.ml pa_j.ml; \ + else if test ${CAMLP5_VERSION} = "6.02.2" -o ${CAMLP5_VERSION} = "6.02.3" -o ${CAMLP5_VERSION} = "6.03" -o ${CAMLP5_VERSION} = "6.04" -o ${CAMLP5_VERSION} = "6.05" -o ${CAMLP5_VERSION} = "6.06" ; \ + then cp pa_j_3.1x_6.02.2.ml pa_j.ml; \ +- else if test ${CAMLP5_VERSION} = "6.06" -o ${CAMLP5_VERSION} = "6.07" -o ${CAMLP5_VERSION} = "6.08" -o ${CAMLP5_VERSION} = "6.09" -o ${CAMLP5_VERSION} = "6.10" -o ${CAMLP5_VERSION} = "6.11" -o ${CAMLP5_VERSION} = "6.12" ; \ ++ else if test ${CAMLP5_VERSION} = "6.06" -o ${CAMLP5_VERSION} = "6.07" -o ${CAMLP5_VERSION} = "6.08" -o ${CAMLP5_VERSION} = "6.09" -o ${CAMLP5_VERSION} = "6.10" -o ${CAMLP5_VERSION} = "6.11" -o ${CAMLP5_VERSION} = "6.12" -o ${CAMLP5_VERSION} = "6.13" -o ${CAMLP5_VERSION} = "6.14" ; \ + then cp pa_j_3.1x_6.11.ml pa_j.ml; \ + else cp pa_j_3.1x_${CAMLP5_BINARY_VERSION}.xx.ml pa_j.ml; \ + fi \ diff --git a/pkgs/applications/science/logic/hol_light/default.nix b/pkgs/applications/science/logic/hol_light/default.nix index 7653e137e260..8311ac466543 100644 --- a/pkgs/applications/science/logic/hol_light/default.nix +++ b/pkgs/applications/science/logic/hol_light/default.nix @@ -20,6 +20,8 @@ stdenv.mkDerivation rec { buildInputs = [ ocaml camlp5 ]; + patches = [ ./Makefile.patch ]; + installPhase = '' mkdir -p "$out/lib/hol_light" "$out/bin" cp -a . $out/lib/hol_light |