Merge branch 'master' into stdenv-updates.

2013-01-11 15:46:10 +01:00
parent 56c7b96844 abd6be85e1
commit b33ad366a1
124 changed files with 1323 additions and 272 deletions
--- a/pkgs/development/web/nodejs/default.nix
+++ b/pkgs/development/web/nodejs/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
    "--shared-v8-libpath=${v8}/lib"
  ];

-  patches = stdenv.lib.optional stdenv.isDarwin ./no-arch-flag.patch;
+  #patches = stdenv.lib.optional stdenv.isDarwin ./no-arch-flag.patch;

  prePatch = ''
    sed -e 's|^#!/usr/bin/env python$|#!${python}/bin/python|g' -i tools/{*.py,waf-light,node-waf} configure