diff options
| author | Florent Becker <florent.becker@univ-orleans.fr> | 2016-01-06 15:13:56 +0100 |
|---|---|---|
| committer | Florent Becker <Florent.Becker@ens-lyon.org> | 2016-01-08 16:06:00 +0100 |
| commit | a14c867d624f2f3a77852f4e19f416209b20f1ff (patch) | |
| tree | eb7136129672cab3ab0af55c7d35bf571195fdc8 /pkgs/development | |
| parent | e956922b92980e3cc404b6c56224b2a81a793ee9 (diff) | |
| download | nixpkgs-a14c867d624f2f3a77852f4e19f416209b20f1ff.tar nixpkgs-a14c867d624f2f3a77852f4e19f416209b20f1ff.tar.gz nixpkgs-a14c867d624f2f3a77852f4e19f416209b20f1ff.tar.bz2 nixpkgs-a14c867d624f2f3a77852f4e19f416209b20f1ff.tar.lz nixpkgs-a14c867d624f2f3a77852f4e19f416209b20f1ff.tar.xz nixpkgs-a14c867d624f2f3a77852f4e19f416209b20f1ff.tar.zst nixpkgs-a14c867d624f2f3a77852f4e19f416209b20f1ff.zip | |
js_of_ocaml: Allow caml >= 4.02 to find camlp4
Diffstat (limited to 'pkgs/development')
| -rw-r--r-- | pkgs/development/tools/ocaml/js_of_ocaml/default.nix | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/pkgs/development/tools/ocaml/js_of_ocaml/default.nix b/pkgs/development/tools/ocaml/js_of_ocaml/default.nix index 0c57ae47c2c..ca5230d1e08 100644 --- a/pkgs/development/tools/ocaml/js_of_ocaml/default.nix +++ b/pkgs/development/tools/ocaml/js_of_ocaml/default.nix @@ -1,18 +1,24 @@ {stdenv, fetchurl, ocaml, findlib, ocaml_lwt, menhir, ocsigen_deriving, camlp4, 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 { name = "js_of_ocaml-2.6"; src = fetchurl { url = https://github.com/ocsigen/js_of_ocaml/archive/2.6.tar.gz; sha256 = "0q34lrn70dvz41m78bwgriyq6dxk97g8gcyg80nvxii4jp86dw61"; }; - + buildInputs = [ocaml findlib menhir ocsigen_deriving cmdliner tyxml reactivedata cppo which base64]; propagatedBuildInputs = [ ocaml_lwt camlp4 ]; - patches = [ ./Makefile.conf.diff ]; + patches = [ ./Makefile.conf.diff camlp4_patch ]; createFindlibDestdir = true; |