From d29eb63542ea36faedbed637a9f0a29ac111a807 Mon Sep 17 00:00:00 2001 From: Jude Taylor Date: Fri, 10 Jul 2015 18:48:14 -0700 Subject: [PATCH] node v0.10 doesn't work either. update libuv on darwin only --- pkgs/top-level/all-packages.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2736481473e6..4e35870192ff 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2003,7 +2003,9 @@ let ninka = callPackage ../development/tools/misc/ninka { }; 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; }; 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; }; - nodejs = if stdenv.system == "armv5tel-linux" || stdenv.isDarwin then + nodejs = if stdenv.system == "armv5tel-linux" then nodejs-0_10 else nodejs-0_12;