about summary refs log tree commit diff
path: root/pkgs
diff options
context:
space:
mode:
authorJaka Hudoklin <jakahudoklin@gmail.com>2015-01-24 22:52:20 +0100
committerJaka Hudoklin <jakahudoklin@gmail.com>2015-01-24 23:28:41 +0100
commita00131bb321fe589a0d06756046b233e97bc0329 (patch)
treeaa8eafa86195c3cea4a8a6663c44be789138f5d2 /pkgs
parent70a4fd863d9619ce2056474bf801e8ef12fd4807 (diff)
downloadnixlib-a00131bb321fe589a0d06756046b233e97bc0329.tar
nixlib-a00131bb321fe589a0d06756046b233e97bc0329.tar.gz
nixlib-a00131bb321fe589a0d06756046b233e97bc0329.tar.bz2
nixlib-a00131bb321fe589a0d06756046b233e97bc0329.tar.lz
nixlib-a00131bb321fe589a0d06756046b233e97bc0329.tar.xz
nixlib-a00131bb321fe589a0d06756046b233e97bc0329.tar.zst
nixlib-a00131bb321fe589a0d06756046b233e97bc0329.zip
nodePackages/buildNodePackage: put patch phase into configure phase, ignore shrinkwrap
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/development/web/nodejs/build-node-package.nix9
1 files 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
       (