From d9925285842828a696ec6ecd69b3a89aae93d2f6 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Tue, 12 Aug 2025 17:40:27 +0200
Subject: [PATCH] fstar: fix installation of OCaml libraries

Fixes #415308
---
 pkgs/by-name/fs/fstar/package.nix | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/fs/fstar/package.nix b/pkgs/by-name/fs/fstar/package.nix
index a103c15768a3..03f9d1cbfa26 100644
--- a/pkgs/by-name/fs/fstar/package.nix
+++ b/pkgs/by-name/fs/fstar/package.nix
@@ -51,8 +51,11 @@ ocamlPackages.buildDunePackage rec {
   '';
 
   buildInputs = with ocamlPackages; [
+    memtrace
+  ];
+
+  propagatedBuildInputs = with ocamlPackages; [
     batteries
-    menhir
     menhirLib
     pprint
     ppx_deriving
@@ -63,7 +66,6 @@ ocamlPackages.buildDunePackage rec {
     stdint
     yojson
     zarith
-    memtrace
     mtime
   ];
 
@@ -85,6 +87,10 @@ ocamlPackages.buildDunePackage rec {
 
     make install
 
+    # Ensure ocamlfind can locate fstar OCaml libraries
+    mkdir -p $OCAMLFIND_DESTDIR
+    ln -s -t $OCAMLFIND_DESTDIR/ $out/lib/fstar
+
     remove-references-to -t '${ocamlPackages.ocaml}' $out/bin/fstar.exe
 
     for binary in $out/bin/*; do