summary refs log tree commit diff
path: root/pkgs/development/node-packages
diff options
context:
space:
mode:
authorJohn Ericson <John.Ericson@Obsidian.Systems>2019-10-31 16:50:15 +0000
committerJohn Ericson <John.Ericson@Obsidian.Systems>2019-11-01 14:44:44 -0400
commit2811b032d639684d3983282e9d10d89f37d161d5 (patch)
tree8354d496dc4207144775f458d81c3b1224014b43 /pkgs/development/node-packages
parent1290e532eac8f8a1815c0aedee94796509e04e3d (diff)
downloadnixpkgs-2811b032d639684d3983282e9d10d89f37d161d5.tar
nixpkgs-2811b032d639684d3983282e9d10d89f37d161d5.tar.gz
nixpkgs-2811b032d639684d3983282e9d10d89f37d161d5.tar.bz2
nixpkgs-2811b032d639684d3983282e9d10d89f37d161d5.tar.lz
nixpkgs-2811b032d639684d3983282e9d10d89f37d161d5.tar.xz
nixpkgs-2811b032d639684d3983282e9d10d89f37d161d5.tar.zst
nixpkgs-2811b032d639684d3983282e9d10d89f37d161d5.zip
treewide: Make still dont* Variables are optional in most cases
Go beyond the obvious setup hooks now, with a bit of sed, with a skipped case:

 - cc-wrapper's `dontlink`, because it already is handled.

Also, in nix files escaping was manually added.

EMP
Diffstat (limited to 'pkgs/development/node-packages')
-rw-r--r--pkgs/development/node-packages/node-env.nix2
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/development/node-packages/node-env.nix b/pkgs/development/node-packages/node-env.nix
index 670556bf271..7cc212c41bd 100644
--- a/pkgs/development/node-packages/node-env.nix
+++ b/pkgs/development/node-packages/node-env.nix
@@ -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