From 5fb1cfb77bf5330d33ad5ccf232c2fdd1cf4eaf7 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Fri, 1 Jun 2018 14:38:54 +0800 Subject: [PATCH] nodePackages_8_x.pnpm: wrap nodejs.passthru.python --- pkgs/development/node-packages/default-v8.nix | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/pkgs/development/node-packages/default-v8.nix b/pkgs/development/node-packages/default-v8.nix index 701648da2280..0428095d97c6 100644 --- a/pkgs/development/node-packages/default-v8.nix +++ b/pkgs/development/node-packages/default-v8.nix @@ -24,13 +24,13 @@ nodePackages // { phantomjs = nodePackages.phantomjs.override (oldAttrs: { buildInputs = oldAttrs.buildInputs ++ [ pkgs.phantomjs2 ]; }); - + webdrvr = nodePackages.webdrvr.override (oldAttrs: { buildInputs = oldAttrs.buildInputs ++ [ pkgs.phantomjs ]; - + preRebuild = '' mkdir $TMPDIR/webdrvr - + ln -s ${pkgs.fetchurl { url = "https://selenium-release.storage.googleapis.com/2.43/selenium-server-standalone-2.43.1.jar"; sha1 = "ef1b5f8ae9c99332f99ba8794988a1d5b974d27b"; @@ -66,6 +66,15 @@ nodePackages // { ''; }); + pnpm = nodePackages.pnpm.override (oldAttrs: { + nativeBuildInputs = oldAttrs.buildInputs ++ [ pkgs.makeWrapper ]; + postInstall = '' + for prog in $out/bin/*; do + wrapProgram "$prog" --prefix PATH : ${stdenv.lib.makeBinPath [ nodejs.passthru.python ]} + done + ''; + }); + fast-cli = nodePackages."fast-cli-1.x".override (oldAttrs: { preRebuild = '' # Simply ignore the phantomjs --version check. It seems to need a display but it is safe to ignore