JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bolt: fix build with OCaml 4.02

Browse Source
This commit is contained in:
Vincent Laporte 2015-06-25 00:15:05 +02:00
parent 5beebaca58
commit ca48e50946
1 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
pkgs/development/ocaml-modules/bolt/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, ocaml, findlib, which }: { stdenv, fetchurl, ocaml, findlib, which, camlp4 }:
let inherit (stdenv.lib) getVersion versionAtLeast; in let inherit (stdenv.lib) getVersion versionAtLeast; in
@ -14,7 +14,20 @@ stdenv.mkDerivation rec {
sha256 = "1c807wrpxra9sbb34lajhimwra28ldxv04m570567lh2b04n38zy"; 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 # The custom `configure` script does not expect the --prefix
# option. Installation is handled by ocamlfind. # option. Installation is handled by ocamlfind.