From fff29a3e5f7991512e790617d1a693df5f3550f6 Mon Sep 17 00:00:00 2001 From: Herwig Hochleitner Date: Wed, 19 Feb 2025 01:03:03 +0100 Subject: [PATCH] buildNpmPackage: pass nativeBuildInputs to npmDeps (for patch phase) --- pkgs/build-support/node/build-npm-package/default.nix | 1 + pkgs/build-support/node/fetch-npm-deps/default.nix | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/build-support/node/build-npm-package/default.nix b/pkgs/build-support/node/build-npm-package/default.nix index 747043e3d12a..9832e11ed923 100644 --- a/pkgs/build-support/node/build-npm-package/default.nix +++ b/pkgs/build-support/node/build-npm-package/default.nix @@ -63,6 +63,7 @@ lib.extendMkDerivation { patches postPatch patchFlags + nativeBuildInputs ; name = "${name}-npm-deps"; hash = npmDepsHash; diff --git a/pkgs/build-support/node/fetch-npm-deps/default.nix b/pkgs/build-support/node/fetch-npm-deps/default.nix index 158ff08fae6c..89f2f5fb8efa 100644 --- a/pkgs/build-support/node/fetch-npm-deps/default.nix +++ b/pkgs/build-support/node/fetch-npm-deps/default.nix @@ -152,6 +152,7 @@ , hash ? "" , forceGitDeps ? false , forceEmptyCache ? false + , nativeBuildInputs ? [ ] , ... } @ args: let @@ -169,7 +170,7 @@ stdenvNoCC.mkDerivation (args // { inherit name; - nativeBuildInputs = [ prefetch-npm-deps ]; + nativeBuildInputs = nativeBuildInputs ++ [ prefetch-npm-deps ]; buildPhase = '' runHook preBuild