Merge master into staging

2015-10-23 01:57:14 +02:00
parent cf787f0282 c76f010450
commit 4917a4f8b3
247 changed files with 16829 additions and 1271 deletions
--- a/pkgs/development/web/nodejs/v0_10.nix
+++ b/pkgs/development/web/nodejs/v0_10.nix
@@ -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 = {