From cebb4788e5d97ec2dbed499c8b739a9c398cc5d6 Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Thu, 20 Oct 2016 08:32:05 +0200
Subject: nodejs: fix darwin build

---
 pkgs/development/web/nodejs/v4.nix | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'pkgs/development/web')

diff --git a/pkgs/development/web/nodejs/v4.nix b/pkgs/development/web/nodejs/v4.nix
index d0e2494cd305..04605c4dea3f 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"
+  '';
 })
-- 
cgit 1.4.1


From d0f288e002ee4a7ef9a375d9666a503c58c32e4e Mon Sep 17 00:00:00 2001
From: Willi Butz <wbutz@cyberfnord.de>
Date: Thu, 20 Oct 2016 22:45:09 +0200
Subject: nodejs-5_x: remove outdated file

---
 pkgs/development/web/nodejs/v5.nix | 12 ------------
 1 file changed, 12 deletions(-)
 delete mode 100644 pkgs/development/web/nodejs/v5.nix

(limited to 'pkgs/development/web')

diff --git a/pkgs/development/web/nodejs/v5.nix b/pkgs/development/web/nodejs/v5.nix
deleted file mode 100644
index 2398ae4e7392..000000000000
--- a/pkgs/development/web/nodejs/v5.nix
+++ /dev/null
@@ -1,12 +0,0 @@
-{ stdenv, fetchurl, openssl, python, zlib, libuv, v8, utillinux, http-parser
-, pkgconfig, runCommand, which, libtool
-, callPackage
-}@args:
-
-import ./nodejs.nix (args // rec {
-  version = "5.12.0";
-  src = fetchurl {
-    url = "http://nodejs.org/dist/v${version}/node-v${version}.tar.xz";
-    sha256 = "4f926373f11f2a25156eee1804ec012eb912c42e5d34fc2909889da22efdadfe";
-  };
-})
-- 
cgit 1.4.1