diff --git a/nix/build.nix b/nix/build.nix index 6a89db8af7..7f3e7656ed 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"; @@ -106,12 +105,18 @@ let rev = "2be2669972dff3ddd4daf89a2cb29d2d06cad7c7"; 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="; - }); + cargoHash = "sha256-urn+A3yuw2uAO4HGmvQnKvWtHqvG9KHxNCCWTiytE4k="; + + # NOTE: can drop once upstream uses `finalAttrs` here: + # https://github.com/NixOS/nixpkgs/blob/10214747f5e6e7cb5b9bdf9e018a3c7b3032f5af/pkgs/build-support/rust/build-rust-package/default.nix#L104 + # + # See (for context): https://github.com/NixOS/nixpkgs/pull/382550 + cargoDeps = rustPlatform.fetchCargoVendor { + inherit (new) src; + hash = new.cargoHash; + patches = new.cargoPatches or []; + name = new.cargoDepsName or new.finalPackage.name; + }; } )) ];