take nodejs as dependency instead of npm, since npm is included in nodejs

Author: VanCoding

buildNodeModules.nix

@@ -1,12 +1,12 @@
-{lib,stdenv,runCommand,coreutils,fetchurl,npm}:
+{lib,stdenv,runCommand,coreutils,fetchurl,nodejs}:
 {directory,buildInputs?[]}:
 let
     buildCache = import ./buildCache.nix {inherit lib runCommand coreutils fetchurl;};
     cache = buildCache {packageLockPath = "${directory}/package-lock.json";};
     derivation = stdenv.mkDerivation {
         pname = "node_modules";
         version = "";
-        buildInputs=[npm coreutils]++buildInputs;
+        buildInputs=[nodejs coreutils]++buildInputs;
         phases = ["buildPhase" "patchPhase" "fixupPhase" ];
         buildPhase = ''
             cp ${directory}/package-lock.json ./package-lock.json

examples/express-app/shell.nix

@@ -1,7 +1,7 @@
 with import <nixpkgs> {};
 
 let
-    buildNodeModules = callPackage ../../buildNodeModules.nix {npm = nodePackages.npm;};
+    buildNodeModules = callPackage ../../buildNodeModules.nix {};
     node_modules = import ./node_modules.nix {inherit buildNodeModules;};
     express-app = callPackage ./default.nix {inherit nodejs node_modules;};
 in

examples/typescript-app/node_modules.nix

@@ -1 +1 @@
-{buildNodeModules,nodejs}: buildNodeModules {directory = ./.;buildInputs=[nodejs];}
+{buildNodeModules}: buildNodeModules {directory = ./.;}

examples/typescript-app/shell.nix

@@ -1,8 +1,8 @@
 with import <nixpkgs> {};
 
 let
-    buildNodeModules = callPackage ../../buildNodeModules.nix {npm = nodePackages.npm;};
-    node_modules = import ./node_modules.nix {inherit buildNodeModules nodejs;};
+    buildNodeModules = callPackage ../../buildNodeModules.nix {};
+    node_modules = import ./node_modules.nix {inherit buildNodeModules;};
     typescript-app = callPackage ./default.nix {inherit nodejs node_modules;};
 in
     mkShell {