Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Use newer cargo-bundle without the build error (#27424)

Browse source 
Fixes Nightly builds for macOS.

Release Notes:

- N/A
This commit is contained in:
Kirill Bulatov 2025-03-25 16:16:23 +02:00 • committed by GitHub
parent d9dcc59334
commit ffee218070
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
nix/build.nix
View file

@ -96,7 +96,7 @@ let
++ lib.optionals stdenv.hostPlatform.isDarwin [ ++ lib.optionals stdenv.hostPlatform.isDarwin [
# TODO: move to overlay so it's usable in the shell # TODO: move to overlay so it's usable in the shell
(cargo-bundle.overrideAttrs (old: { (cargo-bundle.overrideAttrs (old: {
version = "0.6.0-zed"; version = "0.6.1-zed";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "zed-industries"; owner = "zed-industries";
repo = "cargo-bundle"; repo = "cargo-bundle";

2
script/bundle-mac
View file

@ -72,7 +72,7 @@ popd
export ZED_BUNDLE=true export ZED_BUNDLE=true
cargo_bundle_version=$(cargo -q bundle --help 2>&1 | head -n 1 || echo "") cargo_bundle_version=$(cargo -q bundle --help 2>&1 | head -n 1 || echo "")
if [ "$cargo_bundle_version" != "cargo-bundle v0.6.0-zed" ]; then if [ "$cargo_bundle_version" != "cargo-bundle v0.6.1-zed" ]; then
cargo install cargo-bundle --git https://github.com/zed-industries/cargo-bundle.git --branch zed-deploy cargo install cargo-bundle --git https://github.com/zed-industries/cargo-bundle.git --branch zed-deploy
fi fi