From 5c339ff41eda06cfdf0d21e692b033a2973d8a61 Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Fri, 15 Oct 2021 01:27:03 +0200 Subject: [PATCH] netlify-cli: Fix by using explicit esbuild fork package --- pkgs/development/node-packages/default.nix | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-) diff --git a/pkgs/development/node-packages/default.nix b/pkgs/development/node-packages/default.nix index bbc9a804aa74..ccd0b19e1ad3 100644 --- a/pkgs/development/node-packages/default.nix +++ b/pkgs/development/node-packages/default.nix @@ -1,6 +1,7 @@ { pkgs, nodejs, stdenv, applyPatches, fetchFromGitHub, fetchpatch, fetchurl }: let + inherit (pkgs) lib; since = (version: pkgs.lib.versionAtLeast nodejs.version version); before = (version: pkgs.lib.versionOlder nodejs.version version); super = import ./composition.nix { @@ -319,23 +320,11 @@ let }; netlify-cli = - let - esbuild = pkgs.esbuild.overrideAttrs (old: rec { - version = "0.13.6"; - - src = fetchFromGitHub { - owner = "netlify"; - repo = "esbuild"; - rev = "v${version}"; - sha256 = "0asjmqfzdrpfx2hd5hkac1swp52qknyqavsm59j8xr4c1ixhc6n9"; - }; - - }); - in super.netlify-cli.override { preRebuild = '' - export ESBUILD_BINARY_PATH="${esbuild}/bin/esbuild" + export ESBUILD_BINARY_PATH="${pkgs.esbuild_netlify}/bin/esbuild" ''; + meta.maintainers = with lib.maintainers; [ roberth ]; }; ssb-server = super.ssb-server.override {