From e3e4cb72adb5d6810968c148ba5eb15481f1f319 Mon Sep 17 00:00:00 2001 From: Julia Ryan Date: Thu, 3 Apr 2025 10:12:35 -0700 Subject: [PATCH] Fix nix build --- nix/build.nix | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/nix/build.nix b/nix/build.nix index 6a89db8af7e380..e0b80b91eec7cc 100644 --- a/nix/build.nix +++ b/nix/build.nix @@ -96,7 +96,6 @@ let ] ++ lib.optionals stdenv'.hostPlatform.isLinux [ makeWrapper ] ++ lib.optionals stdenv'.hostPlatform.isDarwin [ - # TODO: move to overlay so it's usable in the shell (cargo-bundle.overrideAttrs ( new: old: { version = "0.6.1-zed"; @@ -107,11 +106,10 @@ let hash = "sha256-cSvW0ND148AGdIGWg/ku0yIacVgW+9f1Nsi+kAQxVrI="; }; # https://nixos.asia/en/buildRustPackage - cargoDeps = old.cargoDeps.overrideAttrs ({ - inherit src; - name = "${new.pname}-${new.version}-vendor.tar.gz"; - outputHash = "sha256-Q49FnXNHWhvbH1LtMUpXFcvGKu9VHwqOXXd+MjswO64="; - }); + cargoDeps = rustPlatform.fetchCargoVendor { + inherit (new) pname version src; + hash = "sha256-urn+A3yuw2uAO4HGmvQnKvWtHqvG9KHxNCCWTiytE4k="; + }; } )) ];