diff options
Diffstat (limited to 'build-aux')
| -rw-r--r-- | build-aux/dist-vendor.sh | 18 |
1 files changed, 7 insertions, 11 deletions
diff --git a/build-aux/dist-vendor.sh b/build-aux/dist-vendor.sh index c1430dc..d1fe13b 100644 --- a/build-aux/dist-vendor.sh +++ b/build-aux/dist-vendor.sh @@ -8,18 +8,17 @@ export SOURCE_ROOT="$2" cd "$SOURCE_ROOT" mkdir "$DIST"/.cargo -# cargo-vendor-filterer can be found at https://github.com/coreos/cargo-vendor-filterer -# It is also part of the Rust SDK extension. -# -# nixpkgs doesn't have it packaged though. +# cargo-vendor-filterer can be found at <https://github.com/coreos/cargo-vendor-filterer>, and it is +# also part of the Rust SDK extension. Nixpkgs doesn't have it packaged though. if command -v cargo-vendor-filterer &>/dev/null; then cargo vendor-filterer \ --platform=x86_64-unknown-linux-gnu \ --platform=aarch64-unknown-linux-gnu \ - > "$DIST"/.cargo/config + "$DIST/vendor" + > "$DIST"/.cargo/config.toml else echo "WARNING: using normal cargo vendor" - cargo vendor > "$DIST"/.cargo/config + cargo vendor "$DIST/vendor" > "$DIST"/.cargo/config.toml fi # Remove vendored gettext sources, we'll be using system gettext. @@ -27,9 +26,6 @@ rm -f vendor/gettext-sys/gettext-*.tar.* # Don't combine the previous and this line with a pipe because we can't catch # errors with "set -o pipefail" -sed -i 's/^directory = ".*"/directory = "vendor"/g' "$DIST/.cargo/config" +sed -i 's/^directory = ".*"/directory = "vendor"/g' "$DIST/.cargo/config.toml" -# Move vendor into dist tarball directory -mv vendor "$DIST" - -rm -r "$DIST"/*.nix "$DIST/pkgs" +rm -r "$DIST"/*.nix "$DIST/pkgs" "$DIST/.envrc" |