Merge branch 'master.upstream' into staging.upstream

2015-07-05 13:06:02 -07:00
parent 2363660191 2d1aafef55
commit d605663ae2
155 changed files with 4271 additions and 2114 deletions
--- a/pkgs/development/web/nodejs/default.nix
+++ b/pkgs/development/web/nodejs/default.nix
@@ -42,9 +42,6 @@ in stdenv.mkDerivation {

  patches = if stdenv.isDarwin then [ ./no-xcode.patch ] else null;

-  postPatch = if stdenv.isDarwin then ''
-    (cd tools/gyp; patch -Np1 -i ${../../python-modules/gyp/no-darwin-cflags.patch})
-  '' else null;

  preBuild = if stdenv.isDarwin then ''
    patchShebangs .