Merge pull request #17169 from holidaycheck/nodejs-6.3.1

nodejs-6_x: 6.2.2 -> 6.3.1

2 files changed, 20 insertions, 13 deletions

diff --git a/pkgs/development/web/nodejs/nodejs.nix b/pkgs/development/web/nodejs/nodejs.nix
index debc571ea41..f0f4d71e391 100644
--- a/pkgs/development/web/nodejs/nodejs.nix
+++ b/pkgs/development/web/nodejs/nodejs.nix
@@ -1,8 +1,11 @@
 { stdenv, fetchurl, openssl, python, zlib, libuv, v8, utillinux, http-parser
 , pkgconfig, runCommand, which, libtool
 , version
-, src
+, sha256 ? null
+, src ? fetchurl { url = "https://nodejs.org/download/release/v${version}/node-v${version}.tar.xz"; inherit sha256; }
 , preBuild ? ""
+, extraConfigFlags ? []
+, extraBuildInputs ? []
 , ...
 }:
 
@@ -10,8 +13,8 @@ assert stdenv.system != "armv5tel-linux";
 
 let
 
-  deps = { 
-    inherit openssl zlib libuv; 
+  deps = {
+    inherit openssl zlib libuv;
   } // (stdenv.lib.optionalAttrs (!stdenv.isDarwin) {
     inherit http-parser;
   });
@@ -30,7 +33,7 @@ in stdenv.mkDerivation {
 
   name = "nodejs-${version}";
 
-  configureFlags = concatMap sharedConfigureFlags (builtins.attrNames deps) ++ [ "--without-dtrace" ];
+  configureFlags = concatMap sharedConfigureFlags (builtins.attrNames deps) ++ [ "--without-dtrace" ] ++ extraConfigFlags;
   dontDisableStatic = true;
   prePatch = ''
     patchShebangs .
@@ -39,9 +42,10 @@ in stdenv.mkDerivation {
 
   patches = stdenv.lib.optionals stdenv.isDarwin [ ./no-xcode.patch ];
 
-  buildInputs = [ python which zlib libuv openssl python ]
+  buildInputs = extraBuildInputs
+    ++ [ python which zlib libuv openssl ]
     ++ optionals stdenv.isLinux [ utillinux http-parser ]
-    ++ optionals stdenv.isDarwin [ pkgconfig openssl libtool ];
+    ++ optionals stdenv.isDarwin [ pkgconfig libtool ];
   setupHook = ./setup-hook.sh;
 
   enableParallelBuilding = true;
diff --git a/pkgs/development/web/nodejs/v6.nix b/pkgs/development/web/nodejs/v6.nix
index bde9065d085..b2a50e2a8d9 100644
--- a/pkgs/development/web/nodejs/v6.nix
+++ b/pkgs/development/web/nodejs/v6.nix
@@ -1,15 +1,18 @@
 { stdenv, fetchurl, openssl, python, zlib, libuv, v8, utillinux, http-parser
 , pkgconfig, runCommand, which, libtool
 , callPackage
+, darwin ? null
 }@args:
 
-import ./nodejs.nix (args // rec {
-  version = "6.2.2";
-  src = fetchurl {
-    url = "https://nodejs.org/download/release/v${version}/node-v${version}.tar.xz";
-    sha256 = "2dfeeddba750b52a528b38a1c31e35c1fb40b19cf28fbf430c3c8c7a6517005a";
-  };
-  preBuild = stdenv.lib.optionalString (stdenv.system == "x86_64-darwin") ''
+let
+  inherit (darwin.apple_sdk.frameworks) CoreServices ApplicationServices;
+
+in import ./nodejs.nix (args // rec {
+  version = "6.3.1";
+  sha256 = "06ran2ccfxkwyk6w4wikd7qws286952lbx93pqaygmbh9f0q9rbg";
+  extraBuildInputs = stdenv.lib.optionals stdenv.isDarwin
+    [ CoreServices ApplicationServices ];
+  preBuild = stdenv.lib.optionalString stdenv.isDarwin ''
     sed -i -e "s|tr1/type_traits|type_traits|g" \
       -e "s|std::tr1|std|" src/util.h
   '';