synchronize with trunk

svn path=/nixpkgs/branches/stdenv-updates/; revision=30027
2011-10-26 09:15:25 +00:00
parent 706b80c282 892889cf35
commit dfd063cf12
80 changed files with 1163 additions and 320 deletions
--- a/pkgs/stdenv/adapters.nix
+++ b/pkgs/stdenv/adapters.nix
@@ -11,6 +11,7 @@ rec {
  # Override the compiler in stdenv for specific packages.
  overrideGCC = stdenv: gcc: stdenv //
    { mkDerivation = args: stdenv.mkDerivation (args // { NIX_GCC = gcc; });
+      inherit gcc;
    };