From 587aeb8b1e0a3319188a51ed549da110da1d8376 Mon Sep 17 00:00:00 2001 From: Sefa Eyeoglu Date: Sun, 22 Oct 2023 10:04:13 +0200 Subject: [PATCH] vencord: simplify esbuild override Signed-off-by: Sefa Eyeoglu --- pkgs/misc/vencord/default.nix | 23 ++++++++++------------- 1 file changed, 10 insertions(+), 13 deletions(-) diff --git a/pkgs/misc/vencord/default.nix b/pkgs/misc/vencord/default.nix index 448bc015a706..68a5d246f6ed 100644 --- a/pkgs/misc/vencord/default.nix +++ b/pkgs/misc/vencord/default.nix @@ -2,7 +2,6 @@ , fetchFromGitHub , lib , esbuild -, buildGoModule , buildWebExtension ? false }: let @@ -20,18 +19,16 @@ buildNpmPackage rec { hash = "sha256-cJ+8CKCET7Z2MebyrW5OQr50tvbDM3mkvEQQm3zSbdU="; }; - ESBUILD_BINARY_PATH = lib.getExe (esbuild.override { - buildGoModule = args: buildGoModule (args // rec { - version = "0.15.18"; - src = fetchFromGitHub { - owner = "evanw"; - repo = "esbuild"; - rev = "v${version}"; - hash = "sha256-b9R1ML+pgRg9j2yrkQmBulPuLHYLUQvW+WTyR/Cq6zE="; - }; - vendorHash = "sha256-+BfxCyg0KkDQpHt/wycy/8CTG6YBA/VJvJFhhzUnSiQ="; - }); - }); + ESBUILD_BINARY_PATH = lib.getExe (esbuild.overrideAttrs (final: _: { + version = "0.15.18"; + src = fetchFromGitHub { + owner = "evanw"; + repo = "esbuild"; + rev = "v${final.version}"; + hash = "sha256-b9R1ML+pgRg9j2yrkQmBulPuLHYLUQvW+WTyR/Cq6zE="; + }; + vendorHash = "sha256-+BfxCyg0KkDQpHt/wycy/8CTG6YBA/VJvJFhhzUnSiQ="; + })); # Supresses an error about esbuild's version. npmRebuildFlags = [ "|| true" ];