From a00131bb321fe589a0d06756046b233e97bc0329 Mon Sep 17 00:00:00 2001 From: Jaka Hudoklin Date: Sat, 24 Jan 2015 22:52:20 +0100 Subject: [PATCH] nodePackages/buildNodePackage: put patch phase into configure phase, ignore shrinkwrap --- pkgs/development/web/nodejs/build-node-package.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/development/web/nodejs/build-node-package.nix b/pkgs/development/web/nodejs/build-node-package.nix index 8aae538c8048..a76d45e52740 100644 --- a/pkgs/development/web/nodejs/build-node-package.nix +++ b/pkgs/development/web/nodejs/build-node-package.nix @@ -49,7 +49,9 @@ let in stdenv.mkDerivation ({ inherit src; - postPatch = '' + configurePhase = '' + runHook preConfigure + ${patchShebangs "./"} # Some version specifiers (latest, unstable, URLs, file paths) force NPM @@ -107,10 +109,9 @@ let fs.writeFileSync("package.json", JSON.stringify(packageObj)); EOF ) | node - ''; - configurePhase = '' - runHook preConfigure + # We do not handle shrinkwraps yet + rm npm-shrinkwrap.json 2>/dev/null || true mkdir build-dir (