downloadCargoPackageFromGit: resolve symlinks in crate directory (#367)

ipetkov · Aug 12, 2023 · 7809d36 · 7809d36
1 parent 1b8653a
commit 7809d36
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -8,6 +8,10 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ### Changed
 * `buildTrunkPackage` will now use `dart-sass` instead of `nodePackages.sass`
+* Vendoring git dependencies will now always resolve symlinks inside of a
+  crate's directory. This allows for symlinks inside of a crate's directory to
+  possibly refer to files at the root of the git repo itself (via symlink) and
+  have those contents preserved during vendoring.
 
 ## [0.13.0] - 2023-08-07
 

diff --git a/checks/simple-git-workspace-inheritance/Cargo.lock b/checks/simple-git-workspace-inheritance/Cargo.lock
diff --git a/lib/downloadCargoPackageFromGit.nix b/lib/downloadCargoPackageFromGit.nix
@@ -42,7 +42,7 @@ runCommandLocal "cargo-git" deps ''
       fi
 
       local dest="$out/$crate"
-      cp -r "$(dirname "$cargoToml")" "$dest"
+      cp -rL "$(dirname "$cargoToml")" "$dest"
       chmod +w "$dest"
       echo '{"files":{}, "package":null}' > "$dest/.cargo-checksum.json"