substituteInPlace --replace -> substituteInPlace --replace-fail (#…

…1317) * `substituteInPlace --replace` -> `substituteInPlace --replace-fail` * fix libpq
nix-ocaml · Mar 12, 2024 · 1f739ed · 1f739ed
1 parent 4d2fcf1
commit 1f739ed
Show file tree

Hide file tree

Showing 15 changed files with 86 additions and 202 deletions.
diff --git a/ocaml/binaryen/default.nix b/ocaml/binaryen/default.nix
@@ -11,7 +11,10 @@ buildDunePackage rec {
     hash = "sha256-TE0EXojbKcNmNIvFDLtoUDgqbNEdFillPuTgEN4gmaI=";
   };
 
-  postPatch = ''substituteInPlace src/dune --replace "(libraries libbinaryen.c)" "(c_library_flags -lbinaryen)"'';
+  postPatch = ''
+    substituteInPlace src/dune --replace-fail \
+      "(libraries libbinaryen.c)" "(c_library_flags -lbinaryen)"
+  '';
 
   # Only needed for tests
   # nativeBuildInputs = [ dune-configurator js_of_ocaml ];

diff --git a/ocaml/cookie/session-lwt.nix b/ocaml/cookie/session-lwt.nix
@@ -1,10 +1,14 @@
-{ lib, buildDunePackage, cookie, session-cookie, lwt, result }:
+{ lib, buildDunePackage, cookie, session-cookie, lwt }:
 
 buildDunePackage {
   pname = "session-cookie-lwt";
   inherit (cookie) src version;
 
-  propagatedBuildInputs = [ session-cookie lwt result ];
+  propagatedBuildInputs = [ session-cookie lwt ];
+
+  postPatch = ''
+    substituteInPlace session-cookie-lwt/dune --replace-fail "result" ""
+  '';
 
   meta = {
     description = "Session handling based on Cookie parsing and serialization for OCaml";