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

acgtk: fix build with OCaml 4.02

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

9
pkgs/applications/science/logic/acgtk/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, ocaml, findlib, dypgen, bolt, ansiterminal,
{ stdenv, fetchurl, ocaml, findlib, dypgen, bolt, ansiterminal, camlp4,
buildBytecode ? true,
buildNative ? true,
installExamples ? true,
@ -22,11 +22,16 @@ stdenv.mkDerivation {
sha256 = "1k1ldqg34bwmgdpmi9gry9czlsk85ycjxnkd25fhlf3mmgg4n9p6";
};
buildInputs = [ ocaml findlib dypgen bolt ansiterminal ];
buildInputs = [ ocaml findlib dypgen bolt ansiterminal camlp4 ];
patches = [ ./install-emacs-to-site-lisp.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
# ANSITerminal. We can use the -dllpath flag of ocamlc (analogous to
# -rpath) to make sure that ocamlrun is able to link the library at