From 23da1f17f090ae6bc9485485369f7c390456f642 Mon Sep 17 00:00:00 2001 From: Theodore Ni <3806110+tjni@users.noreply.github.com> Date: Sun, 6 Aug 2023 03:18:17 -0700 Subject: [PATCH] ea: fix build with rust 1.70 --- pkgs/tools/misc/ea/default.nix | 23 ++++++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/ea/default.nix b/pkgs/tools/misc/ea/default.nix index 22d4fa7a207..d45f3b431dc 100644 --- a/pkgs/tools/misc/ea/default.nix +++ b/pkgs/tools/misc/ea/default.nix @@ -1,4 +1,11 @@ -{ lib, stdenv, fetchFromGitHub, rustPlatform, installShellFiles, libiconv }: +{ lib +, stdenv +, fetchFromGitHub +, fetchpatch +, rustPlatform +, installShellFiles +, libiconv +}: rustPlatform.buildRustPackage rec { pname = "ea"; @@ -8,12 +15,22 @@ rustPlatform.buildRustPackage rec { owner = "dduan"; repo = "ea"; rev = version; - sha256 = "VXSSe5d7VO3LfjumzN9a7rrKRedOtOzTdLVQWgV1ED8="; + hash = "sha256-VXSSe5d7VO3LfjumzN9a7rrKRedOtOzTdLVQWgV1ED8="; }; - cargoSha256 = "sha256-YP7OJaIWTXJHe3qF+a3zCFnCHnELX0rAWqnJPaC1T7I="; + cargoPatches = [ + # https://github.com/dduan/ea/pull/64 + (fetchpatch { + name = "update-guard.patch"; + url = "https://github.com/dduan/ea/commit/068aa36d7a472c7a4bac855f2404e7094dec7d58.patch"; + hash = "sha256-iK3fjB6zSDqe0yMUIFjP1nEFLYLFg7dy6+b0T6mC1GA="; + }) + ]; + + cargoHash = "sha256-/MkLWAbEr14CYdqSwJP1vNYxK7pAmMLdhiV61UQEbME="; nativeBuildInputs = [ installShellFiles ]; + buildInputs = lib.optionals stdenv.isDarwin [ libiconv ];