acgtk: fix build with OCaml 4.02
This commit is contained in:
parent
ca48e50946
commit
f7dc2df7c0
|
@ -1,4 +1,4 @@
|
||||||
{ stdenv, fetchurl, ocaml, findlib, dypgen, bolt, ansiterminal,
|
{ stdenv, fetchurl, ocaml, findlib, dypgen, bolt, ansiterminal, camlp4,
|
||||||
buildBytecode ? true,
|
buildBytecode ? true,
|
||||||
buildNative ? true,
|
buildNative ? true,
|
||||||
installExamples ? true,
|
installExamples ? true,
|
||||||
|
@ -22,11 +22,16 @@ stdenv.mkDerivation {
|
||||||
sha256 = "1k1ldqg34bwmgdpmi9gry9czlsk85ycjxnkd25fhlf3mmgg4n9p6";
|
sha256 = "1k1ldqg34bwmgdpmi9gry9czlsk85ycjxnkd25fhlf3mmgg4n9p6";
|
||||||
};
|
};
|
||||||
|
|
||||||
buildInputs = [ ocaml findlib dypgen bolt ansiterminal ];
|
buildInputs = [ ocaml findlib dypgen bolt ansiterminal camlp4 ];
|
||||||
|
|
||||||
patches = [ ./install-emacs-to-site-lisp.patch
|
patches = [ ./install-emacs-to-site-lisp.patch
|
||||||
./use-nix-ocaml-byteflags.patch ];
|
./use-nix-ocaml-byteflags.patch ];
|
||||||
|
|
||||||
|
postPatch = stdenv.lib.optionalString (camlp4 != null) ''
|
||||||
|
substituteInPlace src/Makefile.master.in \
|
||||||
|
--replace "+camlp4" "${camlp4}/lib/ocaml/${getVersion ocaml}/site-lib/camlp4/"
|
||||||
|
'';
|
||||||
|
|
||||||
# The bytecode executable is dependent on the dynamic library provided by
|
# The bytecode executable is dependent on the dynamic library provided by
|
||||||
# ANSITerminal. We can use the -dllpath flag of ocamlc (analogous to
|
# ANSITerminal. We can use the -dllpath flag of ocamlc (analogous to
|
||||||
# -rpath) to make sure that ocamlrun is able to link the library at
|
# -rpath) to make sure that ocamlrun is able to link the library at
|
||||||
|
|
Loading…
Reference in a new issue