From ad566721969e9e765cabfaa6ef972713260757c0 Mon Sep 17 00:00:00 2001 From: hlolli Date: Wed, 19 Feb 2020 23:40:14 +0100 Subject: [PATCH] cleanup --- pkgs/development/interpreters/clojurescript/lumo/default.nix | 3 --- pkgs/development/node-packages/node-env.nix | 2 +- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/pkgs/development/interpreters/clojurescript/lumo/default.nix b/pkgs/development/interpreters/clojurescript/lumo/default.nix index 23dd19b6114e..d6252a7506aa 100644 --- a/pkgs/development/interpreters/clojurescript/lumo/default.nix +++ b/pkgs/development/interpreters/clojurescript/lumo/default.nix @@ -240,10 +240,7 @@ stdenv.mkDerivation { # Step 4: Bunde javascript -echo 1111 -cat scripts/bundle.js NODE_ENV=production node scripts/bundle.js -echo 2222 node scripts/bundleForeign.js # Step 5: Backup resources diff --git a/pkgs/development/node-packages/node-env.nix b/pkgs/development/node-packages/node-env.nix index 670556bf271a..7cc212c41bd6 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