diff options
| author | Sander van der Burg <svanderburg@gmail.com> | 2020-03-15 16:36:51 +0100 |
|---|---|---|
| committer | Sander van der Burg <svanderburg@gmail.com> | 2020-03-15 16:36:51 +0100 |
| commit | 798ab51bc7ec46fb7f9033713b18dbbbc7c3b8c0 (patch) | |
| tree | 4e2d43427a5f8c7529a566005d27a6b43ee262cd /pkgs/development/node-packages/node-env.nix | |
| parent | 5eb01e1a7fd83899dda592a4b4d01344ede9d6b2 (diff) | |
nodePackages: regenerate with node2nix 1.8.0
Diffstat (limited to 'pkgs/development/node-packages/node-env.nix')
| -rw-r--r-- | pkgs/development/node-packages/node-env.nix | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/pkgs/development/node-packages/node-env.nix b/pkgs/development/node-packages/node-env.nix index 670556bf271af..e1abf53049350 100644 --- a/pkgs/development/node-packages/node-env.nix +++ b/pkgs/development/node-packages/node-env.nix @@ -57,7 +57,7 @@ let # Recursively composes the dependencies of a package composePackage = { name, packageName, src, dependencies ? [], ... }@args: - '' + builtins.addErrorContext "while evaluating node package '${packageName}'" '' DIR=$(pwd) cd $TMPDIR @@ -363,7 +363,7 @@ let npm ${forceOfflineFlag} --nodedir=${nodeSources} ${npmFlags} ${stdenv.lib.optionalString production "--production"} rebuild - if [ "$dontNpmInstall" != "1" ] + if [ "''${dontNpmInstall-}" != "1" ] then # NPM tries to download packages even when they already exist if npm-shrinkwrap is used. rm -f npm-shrinkwrap.json @@ -400,6 +400,8 @@ let ++ stdenv.lib.optional (stdenv.isDarwin) libtool ++ buildInputs; + inherit nodejs; + inherit dontStrip; # Stripping may fail a build for some package deployments inherit dontNpmInstall preRebuild unpackPhase buildPhase; @@ -528,8 +530,8 @@ let # Provide the dependencies in a development shell through the NODE_PATH environment variable inherit nodeDependencies; shellHook = stdenv.lib.optionalString (dependencies != []) '' - export NODE_PATH=$nodeDependencies/lib/node_modules - export PATH="$nodeDependencies/bin:$PATH" + export NODE_PATH=${nodeDependencies}/lib/node_modules + export PATH="${nodeDependencies}/bin:$PATH" ''; }; in |