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

node v0.10 doesn't work either. update libuv on darwin only

This commit is contained in:
Jude Taylor 2015-07-10 18:48:14 -07:00
parent a2b3fe28a8
commit d29eb63542
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/top-level/all-packages.nix
View File

@ -2003,7 +2003,9 @@ let
ninka = callPackage ../development/tools/misc/ninka { }; ninka = callPackage ../development/tools/misc/ninka { };
nodejs-0_12 = callPackage ../development/web/nodejs { nodejs-0_12 = callPackage ../development/web/nodejs {
libuv = libuvVersions.v1_2_0; libuv = if stdenv.isDarwin
then libuvVersions.v1_6_1
else libuvVersions.v1_2_0;
libtool = darwin.cctools; libtool = darwin.cctools;
}; };
nodejs-unstable = callPackage ../development/web/nodejs { libuv = libuvVersions.v1_2_0; unstableVersion = true; }; nodejs-unstable = callPackage ../development/web/nodejs { libuv = libuvVersions.v1_2_0; unstableVersion = true; };
@ -2012,7 +2014,7 @@ let
inherit (darwin.apple_sdk.frameworks) CoreServices ApplicationServices Carbon Foundation; inherit (darwin.apple_sdk.frameworks) CoreServices ApplicationServices Carbon Foundation;
}; };
nodejs = if stdenv.system == "armv5tel-linux" || stdenv.isDarwin then nodejs = if stdenv.system == "armv5tel-linux" then
nodejs-0_10 nodejs-0_10
else else
nodejs-0_12; nodejs-0_12;