diff options
| author | K900 <me@0upti.me> | 2024-01-01 18:42:49 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-01-01 18:42:49 +0300 |
| commit | 6cbe5542b8773690359fcd6bfec41d130ed99b72 (patch) | |
| tree | 728818b59beb383c29274c2a05ccd34af6437fbd /pkgs/build-support | |
| parent | d4ae6730e5c9cbcdb1b6595f31f1854806c15148 (diff) | |
| parent | 5a8c65e118c36697efb1fcec3093d915dd68a8ff (diff) | |
| download | nixlib-6cbe5542b8773690359fcd6bfec41d130ed99b72.tar nixlib-6cbe5542b8773690359fcd6bfec41d130ed99b72.tar.gz nixlib-6cbe5542b8773690359fcd6bfec41d130ed99b72.tar.bz2 nixlib-6cbe5542b8773690359fcd6bfec41d130ed99b72.tar.lz nixlib-6cbe5542b8773690359fcd6bfec41d130ed99b72.tar.xz nixlib-6cbe5542b8773690359fcd6bfec41d130ed99b72.tar.zst nixlib-6cbe5542b8773690359fcd6bfec41d130ed99b72.zip | |
Merge pull request #276072 from lilyinstarlight/fix/cargo-workspace-root-fixup-pls
rustPlatform.importCargoLock: fix workspace_root detection
Diffstat (limited to 'pkgs/build-support')
| -rw-r--r-- | pkgs/build-support/rust/import-cargo-lock.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/build-support/rust/import-cargo-lock.nix b/pkgs/build-support/rust/import-cargo-lock.nix index c17b0e41cca8..e3fe57ef06da 100644 --- a/pkgs/build-support/rust/import-cargo-lock.nix +++ b/pkgs/build-support/rust/import-cargo-lock.nix @@ -193,7 +193,7 @@ let if grep -q workspace "$out/Cargo.toml"; then chmod u+w "$out/Cargo.toml" - ${replaceWorkspaceValues} "$out/Cargo.toml" "${tree}/Cargo.toml" + ${replaceWorkspaceValues} "$out/Cargo.toml" "$(${cargo}/bin/cargo metadata --format-version 1 --no-deps --manifest-path $crateCargoTOML | ${jq}/bin/jq -r .workspace_root)/Cargo.toml" fi # Cargo is happy with empty metadata. |