summary refs log tree commit diff
path: root/pkgs/build-support
diff options
context:
space:
mode:
authorgithub-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>2023-11-09 18:00:56 +0000
committerGitHub <noreply@github.com>2023-11-09 18:00:56 +0000
commite112f9b8bbb5af9de4426046a7cb4490e2c12eb0 (patch)
treecfbfa6683968f4f673f45c5ca8b4d6b43bcef225 /pkgs/build-support
parentc17ba56fe923f649d8802777c586f61f8b8c4ad0 (diff)
parentab5d8762780613cc7f99132ba29f8e6ef950178e (diff)
downloadnixpkgs-e112f9b8bbb5af9de4426046a7cb4490e2c12eb0.tar
nixpkgs-e112f9b8bbb5af9de4426046a7cb4490e2c12eb0.tar.gz
nixpkgs-e112f9b8bbb5af9de4426046a7cb4490e2c12eb0.tar.bz2
nixpkgs-e112f9b8bbb5af9de4426046a7cb4490e2c12eb0.tar.lz
nixpkgs-e112f9b8bbb5af9de4426046a7cb4490e2c12eb0.tar.xz
nixpkgs-e112f9b8bbb5af9de4426046a7cb4490e2c12eb0.tar.zst
nixpkgs-e112f9b8bbb5af9de4426046a7cb4490e2c12eb0.zip
Merge master into staging-next
Diffstat (limited to 'pkgs/build-support')
-rw-r--r--pkgs/build-support/node/build-npm-package/default.nix3
1 files changed, 2 insertions, 1 deletions
diff --git a/pkgs/build-support/node/build-npm-package/default.nix b/pkgs/build-support/node/build-npm-package/default.nix
index 7cfc0e9f9c0..9babc7ae628 100644
--- a/pkgs/build-support/node/build-npm-package/default.nix
+++ b/pkgs/build-support/node/build-npm-package/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchNpmDeps, buildPackages, nodejs }:
+{ lib, stdenv, fetchNpmDeps, buildPackages, nodejs } @ topLevelArgs:
 
 { name ? "${args.pname}-${args.version}"
 , src ? null
@@ -34,6 +34,7 @@
 , npmPruneFlags ? npmInstallFlags
   # Value for npm `--workspace` flag and directory in which the files to be installed are found.
 , npmWorkspace ? null
+, nodejs ? topLevelArgs.nodejs
 , ...
 } @ args: