tangled
alpha
login
or
join now
pyrox.dev
/
nixpkgs
lol
0
fork
atom
overview
issues
pulls
pipelines
acgtk: fix build with OCaml 4.02
Vincent Laporte
10 years ago
f7dc2df7
ca48e509
+7
-2
1 changed file
expand all
collapse all
unified
split
pkgs
applications
science
logic
acgtk
default.nix
+7
-2
pkgs/applications/science/logic/acgtk/default.nix
···
1
1
-
{ stdenv, fetchurl, ocaml, findlib, dypgen, bolt, ansiterminal,
1
1
+
{ stdenv, fetchurl, ocaml, findlib, dypgen, bolt, ansiterminal, camlp4,
2
2
buildBytecode ? true,
3
3
buildNative ? true,
4
4
installExamples ? true,
···
22
22
sha256 = "1k1ldqg34bwmgdpmi9gry9czlsk85ycjxnkd25fhlf3mmgg4n9p6";
23
23
};
24
24
25
25
-
buildInputs = [ ocaml findlib dypgen bolt ansiterminal ];
25
25
+
buildInputs = [ ocaml findlib dypgen bolt ansiterminal camlp4 ];
26
26
27
27
patches = [ ./install-emacs-to-site-lisp.patch
28
28
./use-nix-ocaml-byteflags.patch ];
29
29
+
30
30
+
postPatch = stdenv.lib.optionalString (camlp4 != null) ''
31
31
+
substituteInPlace src/Makefile.master.in \
32
32
+
--replace "+camlp4" "${camlp4}/lib/ocaml/${getVersion ocaml}/site-lib/camlp4/"
33
33
+
'';
29
34
30
35
# The bytecode executable is dependent on the dynamic library provided by
31
36
# ANSITerminal. We can use the -dllpath flag of ocamlc (analogous to