Merge remote-tracking branch 'upstream/master' into hardened-stdenv

2016-08-12 09:46:53 +00:00
parent bc025e83bd 532b222296
commit b7787d932e
372 changed files with 7520 additions and 3777 deletions
--- a/pkgs/development/web/nodejs/nodejs.nix
+++ b/pkgs/development/web/nodejs/nodejs.nix
@@ -40,6 +40,10 @@ in stdenv.mkDerivation {
    sed -i 's/raise.*No Xcode or CLT version detected.*/version = "7.0.0"/' tools/gyp/pylib/gyp/xcode_emulation.py
  '';

+  postInstall = ''
+    PATH=$out/bin:$PATH patchShebangs $out
+  '';
+
  patches = stdenv.lib.optionals stdenv.isDarwin [ ./no-xcode.patch ];

  buildInputs = extraBuildInputs