Merge staging into closure-size
The most complex problems were from dealing with switches reverted in the meantime (gcc5, gmp6, ncurses6). It's likely that darwin is (still) broken nontrivially.
This commit is contained in:
@@ -7,7 +7,7 @@
|
||||
assert stdenv.system != "armv5tel-linux";
|
||||
|
||||
let
|
||||
version = "4.1.0";
|
||||
version = "4.2.2";
|
||||
|
||||
deps = {
|
||||
inherit openssl zlib libuv;
|
||||
@@ -31,7 +31,7 @@ in stdenv.mkDerivation {
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://nodejs.org/dist/v${version}/node-v${version}.tar.gz";
|
||||
sha256 = "453005f64ee529f7dcf1237eb27ee2fa2415c49f5c9e7463e8b71fba61c5b408";
|
||||
sha256 = "1c8c45b39fg2mz1c88jl0q0yhpxixdr25rpmpfskdd1m6hshkrq0";
|
||||
};
|
||||
|
||||
configureFlags = concatMap sharedConfigureFlags (builtins.attrNames deps) ++ [ "--without-dtrace" ];
|
||||
|
||||
@@ -56,6 +56,13 @@ in stdenv.mkDerivation {
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
postFixup = ''
|
||||
pushd $out/lib/node_modules/npm/node_modules/node-gyp
|
||||
patch -p2 < ${./no-xcode.patch}
|
||||
popd
|
||||
sed -i 's/raise.*No Xcode or CLT version detected.*/version = "7.0.0"/' $out/lib/node_modules/npm/node_modules/node-gyp/gyp/pylib/gyp/xcode_emulation.py
|
||||
'';
|
||||
|
||||
passthru.interpreterName = "nodejs-0.10";
|
||||
|
||||
meta = {
|
||||
|
||||
Reference in New Issue
Block a user