diff options
| author | K900 <me@0upti.me> | 2024-01-02 10:55:23 +0300 |
|---|---|---|
| committer | K900 <me@0upti.me> | 2024-01-02 10:55:23 +0300 |
| commit | 887e96e875e933c0a5d203ffc40e202f3d16317e (patch) | |
| tree | 07c2de06c350dc5e330f71aa79796368ae5e2179 /pkgs/build-support/rust | |
| parent | 494bdb470881cb8714b47a0bbb0048157e8fdeda (diff) | |
| parent | 6786065ebd23800c6673fe80a5c97d3ec9e439d6 (diff) | |
| download | nixlib-887e96e875e933c0a5d203ffc40e202f3d16317e.tar nixlib-887e96e875e933c0a5d203ffc40e202f3d16317e.tar.gz nixlib-887e96e875e933c0a5d203ffc40e202f3d16317e.tar.bz2 nixlib-887e96e875e933c0a5d203ffc40e202f3d16317e.tar.lz nixlib-887e96e875e933c0a5d203ffc40e202f3d16317e.tar.xz nixlib-887e96e875e933c0a5d203ffc40e202f3d16317e.tar.zst nixlib-887e96e875e933c0a5d203ffc40e202f3d16317e.zip | |
Merge remote-tracking branch 'origin/master' into staging-next
Diffstat (limited to 'pkgs/build-support/rust')
| -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. |