From ca48e509465d08690472d9ab3f7242184c12b886 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Thu, 25 Jun 2015 00:15:05 +0200 Subject: [PATCH] bolt: fix build with OCaml 4.02 --- pkgs/development/ocaml-modules/bolt/default.nix | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/pkgs/development/ocaml-modules/bolt/default.nix b/pkgs/development/ocaml-modules/bolt/default.nix index 9b0efd816bd..61c3d6f23b4 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 < "camlp4of" in +--- +> let camlp4of = "camlp4of" in +EOF + ''; # The custom `configure` script does not expect the --prefix # option. Installation is handled by ocamlfind.