diff options
author | Frederik Rietdijk <fridh@fridh.nl> | 2016-10-22 17:23:24 +0200 |
---|---|---|
committer | Frederik Rietdijk <fridh@fridh.nl> | 2016-10-22 17:23:24 +0200 |
commit | e56832d7301f2be7c18abf12d151db00be88f6fa (patch) | |
tree | 8023c83da9db86e0a31535ad9b09e9f601c3b250 /pkgs/development/web | |
parent | bd12c109931951a36449edaa9c8ed3fc85dc6984 (diff) | |
parent | 8c465c5201e819486b3072be563738cc1801e8d7 (diff) | |
download | nixlib-e56832d7301f2be7c18abf12d151db00be88f6fa.tar nixlib-e56832d7301f2be7c18abf12d151db00be88f6fa.tar.gz nixlib-e56832d7301f2be7c18abf12d151db00be88f6fa.tar.bz2 nixlib-e56832d7301f2be7c18abf12d151db00be88f6fa.tar.lz nixlib-e56832d7301f2be7c18abf12d151db00be88f6fa.tar.xz nixlib-e56832d7301f2be7c18abf12d151db00be88f6fa.tar.zst nixlib-e56832d7301f2be7c18abf12d151db00be88f6fa.zip |
Merge remote-tracking branch 'upstream/master' into HEAD
Diffstat (limited to 'pkgs/development/web')
-rw-r--r-- | pkgs/development/web/nodejs/v4.nix | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/pkgs/development/web/nodejs/v4.nix b/pkgs/development/web/nodejs/v4.nix index 915a560be6e2..f0a505a683a8 100644 --- 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" + ''; }) |