zed-editor: 1.4.4 -> 1.5.4 (#527683)
This commit is contained in:
@@ -31,6 +31,7 @@
|
||||
libx11,
|
||||
libxext,
|
||||
livekit-libwebrtc,
|
||||
lld,
|
||||
testers,
|
||||
writableTmpDirAsHomeHook,
|
||||
|
||||
@@ -97,7 +98,7 @@ let
|
||||
in
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "zed-editor";
|
||||
version = "1.4.4";
|
||||
version = "1.5.4";
|
||||
|
||||
outputs = [
|
||||
"out"
|
||||
@@ -110,7 +111,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
owner = "zed-industries";
|
||||
repo = "zed";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-ALK/ZffZ+sqMaZi5dy40nzE1dLqZrbgbxRcQaYL6AkI=";
|
||||
hash = "sha256-I9+v5qeubBA9bAS4OU7V/BsxxfP5rj9aS4xvopbF578=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
@@ -139,7 +140,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
rm -r $out/git/*/candle-book/
|
||||
'';
|
||||
|
||||
cargoHash = "sha256-XHkQ9jrOsDbpt+zC96QrBqvCzEeuzC/WY4cjRdYVr9Q=";
|
||||
cargoHash = "sha256-x40nSnpksKX+JFuN1RSsVm3OrrArb0rtalQplLstAd8=";
|
||||
|
||||
__structuredAttrs = true;
|
||||
|
||||
@@ -152,6 +153,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
++ lib.optionals stdenv.hostPlatform.isLinux [ makeBinaryWrapper ]
|
||||
++ lib.optionals stdenv.hostPlatform.isDarwin [
|
||||
cargo-bundle
|
||||
lld
|
||||
rustPlatform.bindgenHook
|
||||
];
|
||||
|
||||
@@ -208,6 +210,11 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
# Used by `zed --version`
|
||||
RELEASE_VERSION = finalAttrs.version;
|
||||
LK_CUSTOM_WEBRTC = livekit-libwebrtc;
|
||||
}
|
||||
// lib.optionalAttrs stdenv.hostPlatform.isDarwin {
|
||||
# Link with lld on Darwin. nixpkgs' classic open-source ld64 fails to insert
|
||||
# ARM64 branch thunks for this binary, producing `b(l) ARM64 branch out of range`.
|
||||
NIX_CFLAGS_LINK = "-fuse-ld=lld";
|
||||
};
|
||||
|
||||
preBuild = ''
|
||||
|
||||
Reference in New Issue
Block a user