summary refs log tree commit diff
path: root/pkgs/development
diff options
context:
space:
mode:
authorVincent Laporte <Vincent.Laporte@gmail.com>2019-09-06 16:01:55 +0000
committerVincent Laporte <vbgl@users.noreply.github.com>2019-09-14 06:54:35 +0000
commit912f03d0d45d5bc9321733496e7d3b9322840938 (patch)
treeedd04625f710b9c38b782e674d6ab1886ea35088 /pkgs/development
parent5a5a87cd002ab6875789f48a2ee697bc3b237f95 (diff)
downloadnixpkgs-912f03d0d45d5bc9321733496e7d3b9322840938.tar
nixpkgs-912f03d0d45d5bc9321733496e7d3b9322840938.tar.gz
nixpkgs-912f03d0d45d5bc9321733496e7d3b9322840938.tar.bz2
nixpkgs-912f03d0d45d5bc9321733496e7d3b9322840938.tar.lz
nixpkgs-912f03d0d45d5bc9321733496e7d3b9322840938.tar.xz
nixpkgs-912f03d0d45d5bc9321733496e7d3b9322840938.tar.zst
nixpkgs-912f03d0d45d5bc9321733496e7d3b9322840938.zip
ocamlPackages.xtmpl: fix for jsoo ≥ 3.4.0
Diffstat (limited to 'pkgs/development')
-rw-r--r--pkgs/development/ocaml-modules/xtmpl/default.nix2
-rw-r--r--pkgs/development/ocaml-modules/xtmpl/jsoo.patch26
2 files changed, 28 insertions, 0 deletions
diff --git a/pkgs/development/ocaml-modules/xtmpl/default.nix b/pkgs/development/ocaml-modules/xtmpl/default.nix
index 4c5d1edcb09..2c4cf4928db 100644
--- a/pkgs/development/ocaml-modules/xtmpl/default.nix
+++ b/pkgs/development/ocaml-modules/xtmpl/default.nix
@@ -15,6 +15,8 @@ stdenv.mkDerivation rec {
     sha256 = "1hq6y4rhz958q40145k4av8hx8jyvspg78xf741samd7vc3jd221";
   };
 
+  patches = [ ./jsoo.patch ];
+
   buildInputs = [ ocaml findlib ppx_tools js_of_ocaml js_of_ocaml-ppx ];
   propagatedBuildInputs = [ iri re ];
 
diff --git a/pkgs/development/ocaml-modules/xtmpl/jsoo.patch b/pkgs/development/ocaml-modules/xtmpl/jsoo.patch
new file mode 100644
index 00000000000..7546dbca924
--- /dev/null
+++ b/pkgs/development/ocaml-modules/xtmpl/jsoo.patch
@@ -0,0 +1,26 @@
+diff --git a/xtmpl_js.ml b/xtmpl_js.ml
+index e0d3894..991d1b3 100644
+--- a/xtmpl_js.ml
++++ b/xtmpl_js.ml
+@@ -25,6 +25,8 @@
+ 
+ (** *)
+ 
++open Js_of_ocaml
++
+ let log s = Firebug.console##log (Js.string s);;
+ 
+ module X = Xtmpl_rewrite
+diff --git a/xtmpl_js.mli b/xtmpl_js.mli
+index d709896..5ed471c 100644
+--- a/xtmpl_js.mli
++++ b/xtmpl_js.mli
+@@ -25,6 +25,8 @@
+ 
+ (** Convenient functions to use in JS code *)
+ 
++open Js_of_ocaml
++
+ (** Create a new tree of DOM nodes from a given XML tree.
+   Errors are logged to the firebug console.
+   @param doc Default is [Dom_html.document].