public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #17169 from holidaycheck/nodejs-6.3.1 

nodejs-6_x: 6.2.2 -> 6.3.1
This commit is contained in:
Wout Mertens 2016-07-22 11:29:22 +02:00 committed by GitHub
parent 390b49a3e7 39cf213e2b
commit 434f9d158b
2 changed files with 20 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkgs/development/web/nodejs/nodejs.nix
View File

@ -1,8 +1,11 @@
{ stdenv, fetchurl, openssl, python, zlib, libuv, v8, utillinux, http-parser { stdenv, fetchurl, openssl, python, zlib, libuv, v8, utillinux, http-parser
, pkgconfig, runCommand, which, libtool , pkgconfig, runCommand, which, libtool
, version , version
, src , sha256 ? null
, src ? fetchurl { url = "https://nodejs.org/download/release/v${version}/node-v${version}.tar.xz"; inherit sha256; }
, preBuild ? "" , preBuild ? ""
, extraConfigFlags ? []
, extraBuildInputs ? []
, ... , ...
}: }:
@ -30,7 +33,7 @@ in stdenv.mkDerivation {
name = "nodejs-${version}"; name = "nodejs-${version}";
configureFlags = concatMap sharedConfigureFlags (builtins.attrNames deps) ++ [ "--without-dtrace" ]; configureFlags = concatMap sharedConfigureFlags (builtins.attrNames deps) ++ [ "--without-dtrace" ] ++ extraConfigFlags;
dontDisableStatic = true; dontDisableStatic = true;
prePatch = '' prePatch = ''
patchShebangs . patchShebangs .
@ -39,9 +42,10 @@ in stdenv.mkDerivation {
patches = stdenv.lib.optionals stdenv.isDarwin [ ./no-xcode.patch ]; 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.isLinux [ utillinux http-parser ]
++ optionals stdenv.isDarwin [ pkgconfig openssl libtool ]; ++ optionals stdenv.isDarwin [ pkgconfig libtool ];
setupHook = ./setup-hook.sh; setupHook = ./setup-hook.sh;
enableParallelBuilding = true; enableParallelBuilding = true;

17
pkgs/development/web/nodejs/v6.nix
View File

@ -1,15 +1,18 @@
{ stdenv, fetchurl, openssl, python, zlib, libuv, v8, utillinux, http-parser { stdenv, fetchurl, openssl, python, zlib, libuv, v8, utillinux, http-parser
, pkgconfig, runCommand, which, libtool , pkgconfig, runCommand, which, libtool
, callPackage , callPackage
, darwin ? null
}@args: }@args:
import ./nodejs.nix (args // rec { let
version = "6.2.2"; inherit (darwin.apple_sdk.frameworks) CoreServices ApplicationServices;
src = fetchurl {
url = "https://nodejs.org/download/release/v${version}/node-v${version}.tar.xz"; in import ./nodejs.nix (args // rec {
sha256 = "2dfeeddba750b52a528b38a1c31e35c1fb40b19cf28fbf430c3c8c7a6517005a"; version = "6.3.1";
}; sha256 = "06ran2ccfxkwyk6w4wikd7qws286952lbx93pqaygmbh9f0q9rbg";
preBuild = stdenv.lib.optionalString (stdenv.system == "x86_64-darwin") '' extraBuildInputs = stdenv.lib.optionals stdenv.isDarwin
[ CoreServices ApplicationServices ];
preBuild = stdenv.lib.optionalString stdenv.isDarwin ''
sed -i -e "s|tr1/type_traits|type_traits|g" \ sed -i -e "s|tr1/type_traits|type_traits|g" \
-e "s|std::tr1|std|" src/util.h -e "s|std::tr1|std|" src/util.h
''; '';