From 0b97cb69f3b62e7cb4a482744ffdf6c17617b733 Mon Sep 17 00:00:00 2001
From: adisbladis <adis@blad.is>
Date: Wed, 6 Jun 2018 15:53:27 +0800
Subject: [PATCH] nodePackages_8_x: Add nodejs (npm) to wrapper

Some pnpm commands forward to npm which might not exist in $PATH
---
 pkgs/development/node-packages/default-v8.nix | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/node-packages/default-v8.nix b/pkgs/development/node-packages/default-v8.nix
index 0428095d97c..eb87f13f56d 100644
--- a/pkgs/development/node-packages/default-v8.nix
+++ b/pkgs/development/node-packages/default-v8.nix
@@ -68,9 +68,14 @@ nodePackages // {
 
   pnpm = nodePackages.pnpm.override (oldAttrs: {
     nativeBuildInputs = oldAttrs.buildInputs ++ [ pkgs.makeWrapper ];
-    postInstall = ''
+    postInstall = let
+      pnpmLibPath = stdenv.lib.makeBinPath [
+        nodejs.passthru.python
+        nodejs
+      ];
+    in ''
       for prog in $out/bin/*; do
-        wrapProgram "$prog" --prefix PATH : ${stdenv.lib.makeBinPath [ nodejs.passthru.python ]}
+        wrapProgram "$prog" --prefix PATH : ${pnpmLibPath}
       done
     '';
   });