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

js_of_ocaml: Allow caml >= 4.02 to find camlp4

Browse Source
This commit is contained in:
Florent Becker 2016-01-06 15:13:56 +01:00 committed by Florent Becker
parent e956922b92
commit a14c867d62
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/development/tools/ocaml/js_of_ocaml/default.nix
View File

@ -1,6 +1,12 @@
{stdenv, fetchurl, ocaml, findlib, ocaml_lwt, menhir, ocsigen_deriving, camlp4, {stdenv, fetchurl, ocaml, findlib, ocaml_lwt, menhir, ocsigen_deriving, camlp4,
cmdliner, tyxml, reactivedata, cppo, which, base64}: cmdliner, tyxml, reactivedata, cppo, which, base64}:
let camlp4_patch = fetchurl {
url = "https://github.com/FlorentBecker/js_of_ocaml/commit/3b511c5bb777d5049c49d7a04c01f142de7096b9.patch";
sha256 = "c92eda8be504cd41eb242166fc815af496243b63d4d21b169f5b62ec5ace2d39";
};
in
stdenv.mkDerivation { stdenv.mkDerivation {
name = "js_of_ocaml-2.6"; name = "js_of_ocaml-2.6";
src = fetchurl { src = fetchurl {
@ -12,7 +18,7 @@ stdenv.mkDerivation {
cmdliner tyxml reactivedata cppo which base64]; cmdliner tyxml reactivedata cppo which base64];
propagatedBuildInputs = [ ocaml_lwt camlp4 ]; propagatedBuildInputs = [ ocaml_lwt camlp4 ];
patches = [ ./Makefile.conf.diff ]; patches = [ ./Makefile.conf.diff camlp4_patch ];
createFindlibDestdir = true; createFindlibDestdir = true;