diff options
| author | adisbladis <adis@blad.is> | 2018-06-06 15:53:27 +0800 |
|---|---|---|
| committer | adisbladis <adis@blad.is> | 2018-06-06 15:54:24 +0800 |
| commit | 0b97cb69f3b62e7cb4a482744ffdf6c17617b733 (patch) | |
| tree | c0dfb0d5cbe5b1a30e13c5bf851a8b60ed047780 | |
| parent | 832973d1791cacedb22f3ee4be87c4c84288f581 (diff) | |
| download | nixpkgs-0b97cb69f3b62e7cb4a482744ffdf6c17617b733.tar nixpkgs-0b97cb69f3b62e7cb4a482744ffdf6c17617b733.tar.gz nixpkgs-0b97cb69f3b62e7cb4a482744ffdf6c17617b733.tar.bz2 nixpkgs-0b97cb69f3b62e7cb4a482744ffdf6c17617b733.tar.lz nixpkgs-0b97cb69f3b62e7cb4a482744ffdf6c17617b733.tar.xz nixpkgs-0b97cb69f3b62e7cb4a482744ffdf6c17617b733.tar.zst nixpkgs-0b97cb69f3b62e7cb4a482744ffdf6c17617b733.zip | |
nodePackages_8_x: Add nodejs (npm) to wrapper
Some pnpm commands forward to npm which might not exist in $PATH
| -rw-r--r-- | pkgs/development/node-packages/default-v8.nix | 9 |
1 files 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 ''; }); |