* Sync with the trunk once more.

* Turn on everything in Hydra.

svn path=/nixpkgs/branches/stdenv-updates/; revision=14806

1 files changed, 15 insertions, 2 deletions

diff --git a/pkgs/stdenv/adapters.nix b/pkgs/stdenv/adapters.nix
index ff4de11bc8b70..5be18ae205ae7 100644
--- a/pkgs/stdenv/adapters.nix
+++ b/pkgs/stdenv/adapters.nix
@@ -107,5 +107,18 @@ rec {
       isStatic = true;
     } // {inherit fetchurl;};
 
-      
-}
\ No newline at end of file
+
+  /* Modify a stdenv so that the specified attributes are added to
+     every derivation returned by its mkDerivation function.
+
+     Example:
+       stdenvNoOptimise =
+         addAttrsToDerivation
+           { NIX_CFLAGS_COMPILE = "-O0"; }
+           stdenv;
+  */
+  addAttrsToDerivation = extraAttrs: stdenv: stdenv //
+    { mkDerivation = args: stdenv.mkDerivation (args // extraAttrs); };
+
+
+}