From b0d981402e1d38e87ceef75a7410109f54c396ad Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Fri, 5 Apr 2024 13:17:32 +0200
Subject: [PATCH] ocamlPackages.vcaml: fix build with ppxlib > 0.30

---
 .../ocaml-modules/janestreet/0.16.nix         |  1 +
 .../ocaml-modules/janestreet/vcaml.patch      | 22 +++++++++++++++++++
 2 files changed, 23 insertions(+)
 create mode 100644 pkgs/development/ocaml-modules/janestreet/vcaml.patch

diff --git a/pkgs/development/ocaml-modules/janestreet/0.16.nix b/pkgs/development/ocaml-modules/janestreet/0.16.nix
index 562364df53bc..35d2895f679f 100644
--- a/pkgs/development/ocaml-modules/janestreet/0.16.nix
+++ b/pkgs/development/ocaml-modules/janestreet/0.16.nix
@@ -1221,6 +1221,7 @@ with self;
     hash = "sha256-pmEKi24+22T76SzI3RpBmQF7ZrQwlngrpFYLoBdLwe0=";
     meta.description = "OCaml bindings for the Neovim API";
     propagatedBuildInputs = [ angstrom-async async_extra expect_test_helpers_async faraday jsonaf man_in_the_middle_debugger semantic_version ];
+    patches = [ ./vcaml.patch ];
   };
 
   virtual_dom = janePackage {
diff --git a/pkgs/development/ocaml-modules/janestreet/vcaml.patch b/pkgs/development/ocaml-modules/janestreet/vcaml.patch
new file mode 100644
index 000000000000..5d0fbbec4d33
--- /dev/null
+++ b/pkgs/development/ocaml-modules/janestreet/vcaml.patch
@@ -0,0 +1,22 @@
+diff --git a/src/api_call.ml b/src/api_call.ml
+index 66f5083..6e96e95 100644
+--- a/src/api_call.ml
++++ b/src/api_call.ml
+@@ -112,7 +112,7 @@ include
+       include T
+     end)
+     (Open_on_rhs_intf)
+-    ()
++    (struct end)
+ 
+ module Or_error = struct
+   type nonrec 'a t = 'a Or_error.t t
+@@ -138,7 +138,7 @@ module Or_error = struct
+         include T
+       end)
+       (Open_on_rhs_intf)
+-      ()
++      (struct end)
+ 
+   let error_s sexp = Const (Or_error.error_s sexp)
+   let ignore_m t = map t ~f:ignore