From 85c59938d80398d1effde0d48ddcd18101cf99ce Mon Sep 17 00:00:00 2001
From: Vincent Laporte <vbgl@users.noreply.github.com>
Date: Sat, 20 Dec 2025 12:29:57 +0100
Subject: [PATCH] Revert "ocamlPackages.buildDunePackage: Use final pname and
 version"

---
 pkgs/build-support/ocaml/dune.nix | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/pkgs/build-support/ocaml/dune.nix b/pkgs/build-support/ocaml/dune.nix
index a5f72dd37968..cbd1957dc2a8 100644
--- a/pkgs/build-support/ocaml/dune.nix
+++ b/pkgs/build-support/ocaml/dune.nix
@@ -37,10 +37,10 @@ lib.extendMkDerivation {
     in
 
     if args ? minimalOCamlVersion && lib.versionOlder ocaml.version args.minimalOCamlVersion then
-      throw "${finalAttrs.pname}-${finalAttrs.version} is not available for OCaml ${ocaml.version}"
+      throw "${pname}-${version} is not available for OCaml ${ocaml.version}"
     else
       {
-        name = "ocaml${ocaml.version}-${finalAttrs.pname}-${finalAttrs.version}";
+        name = "ocaml${ocaml.version}-${pname}-${version}";
 
         strictDeps = true;
 
@@ -58,14 +58,14 @@ lib.extendMkDerivation {
         buildPhase =
           args.buildPhase or ''
             runHook preBuild
-            dune build -p ${finalAttrs.pname} ''${enableParallelBuilding:+-j $NIX_BUILD_CORES}
+            dune build -p ${pname} ''${enableParallelBuilding:+-j $NIX_BUILD_CORES}
             runHook postBuild
           '';
 
         installPhase =
           args.installPhase or ''
             runHook preInstall
-            dune install --prefix $out --libdir $OCAMLFIND_DESTDIR ${finalAttrs.pname} \
+            dune install --prefix $out --libdir $OCAMLFIND_DESTDIR ${pname} \
              ${
                if lib.versionAtLeast Dune.version "2.9" then
                  "--docdir $out/share/doc --mandir $out/share/man"
@@ -78,15 +78,11 @@ lib.extendMkDerivation {
         checkPhase =
           args.checkPhase or ''
             runHook preCheck
-            dune runtest -p ${finalAttrs.pname} ''${enableParallelBuilding:+-j $NIX_BUILD_CORES}
+            dune runtest -p ${pname} ''${enableParallelBuilding:+-j $NIX_BUILD_CORES}
             runHook postCheck
           '';
 
         meta = (args.meta or { }) // {
-          # TODO: ocaml.meta.platforms is where the compiler can run
-          # Package's meta.platforms are where the compiler can target.
-          #
-          # See: rustc.targetPlatforms
           platforms = args.meta.platforms or ocaml.meta.platforms;
         };
       };