Merge remote-tracking branch 'upstream/master' into HEAD

2016-10-22 17:23:24 +02:00
parent bd12c10993 8c465c5201
commit e56832d730
221 changed files with 10778 additions and 4428 deletions
--- a/pkgs/development/web/nodejs/v4.nix
+++ b/pkgs/development/web/nodejs/v4.nix
@@ -9,4 +9,9 @@ import ./nodejs.nix (args // rec {
    url = "http://nodejs.org/dist/v${version}/node-v${version}.tar.xz";
    sha256 = "1566q1kkv8j30fgqx8sm2h8323f38wwpa1hfb10gr6z46jyhv4a2";
  };
+
+  preBuild = stdenv.lib.optionalString stdenv.isDarwin ''
+    substituteInPlace src/util.h \
+      --replace "tr1/type_traits" "type_traits"
+  '';
 })