diff options
author | Vincent Laporte <Vincent.Laporte@gmail.com> | 2015-06-25 00:15:05 +0200 |
---|---|---|
committer | Vincent Laporte <Vincent.Laporte@gmail.com> | 2015-06-25 08:55:29 +0200 |
commit | ca48e509465d08690472d9ab3f7242184c12b886 (patch) | |
tree | 1b071c7892f064381f2adce99629a9d144ebeb4e /pkgs/development/ocaml-modules/bolt/default.nix | |
parent | 5beebaca58d071a1fa0e0a92e15cbecbcf192ff5 (diff) | |
download | nixlib-ca48e509465d08690472d9ab3f7242184c12b886.tar nixlib-ca48e509465d08690472d9ab3f7242184c12b886.tar.gz nixlib-ca48e509465d08690472d9ab3f7242184c12b886.tar.bz2 nixlib-ca48e509465d08690472d9ab3f7242184c12b886.tar.lz nixlib-ca48e509465d08690472d9ab3f7242184c12b886.tar.xz nixlib-ca48e509465d08690472d9ab3f7242184c12b886.tar.zst nixlib-ca48e509465d08690472d9ab3f7242184c12b886.zip |
bolt: fix build with OCaml 4.02
Diffstat (limited to 'pkgs/development/ocaml-modules/bolt/default.nix')
-rw-r--r-- | pkgs/development/ocaml-modules/bolt/default.nix | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/pkgs/development/ocaml-modules/bolt/default.nix b/pkgs/development/ocaml-modules/bolt/default.nix index 9b0efd816bdc..61c3d6f23b40 100644 --- a/pkgs/development/ocaml-modules/bolt/default.nix +++ b/pkgs/development/ocaml-modules/bolt/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ocaml, findlib, which }: +{ stdenv, fetchurl, ocaml, findlib, which, camlp4 }: let inherit (stdenv.lib) getVersion versionAtLeast; in @@ -14,7 +14,20 @@ stdenv.mkDerivation rec { sha256 = "1c807wrpxra9sbb34lajhimwra28ldxv04m570567lh2b04n38zy"; }; - buildInputs = [ ocaml findlib which ]; + buildInputs = [ ocaml findlib which camlp4 ]; + + patchPhase = '' + patch myocamlbuild.ml <<EOF +70,74c70 +< let camlp4of = +< try +< let path_bin = Filename.concat (Sys.getenv "PATH_OCAML_PREFIX") "bin" in +< Filename.concat path_bin "camlp4of" +< with _ -> "camlp4of" in +--- +> let camlp4of = "camlp4of" in +EOF + ''; # The custom `configure` script does not expect the --prefix # option. Installation is handled by ocamlfind. |