Do not assume build dir name

Signed-off-by: Marek Kubica <[email protected]>

Author: Leonidas-from-XIV

src/dune_pkg/lock_dir.ml

@@ -526,10 +526,11 @@ let in_source_tree path =
        Path.Source.L.relative Path.Source.root components
      | source_components ->
        (match Path.Build.explode b with
-        | ".dev-tools.locks" :: dev_tool :: components ->
-          Path.Source.L.relative
-            Path.Source.root
-            ([ "_build"; ".dev-tools.locks"; dev_tool ] @ components)
+        | (".dev-tools.locks" as prefix) :: dev_tool :: components ->
+          let build_as_source =
+            Path.build_dir |> Path.to_string |> Path.Source.of_string
+          in
+          Path.Source.L.relative build_as_source (prefix :: dev_tool :: components)
         | build_components ->
           Code_error.raise
             "Unexpected location of lock directory in build directory"

src/dune_pkg/workspace.ml

@@ -79,10 +79,9 @@ let dev_tool_path_to_source_dir path =
       [ "external", Path.External.to_dyn path ]
   | In_build_dir b ->
     (match Path.Build.explode b with
-     | ".dev-tools.locks" :: dev_tool_name :: components ->
-       Path.Source.L.relative
-         Path.Source.root
-         ([ "_build"; ".dev-tools.locks"; dev_tool_name ] @ components)
+     | (".dev-tools.locks" as prefix) :: dev_tool_name :: components ->
+       let build_as_source = Path.build_dir |> Path.to_string |> Path.Source.of_string in
+       Path.Source.L.relative build_as_source (prefix :: dev_tool_name :: components)
      | components ->
        Code_error.raise
          "Unexpected external path"