summary refs log tree commit diff
path: root/pkgs/stdenv
diff options
context:
space:
mode:
authorPeter Simons <simons@cryp.to>2011-10-26 09:15:25 +0000
committerPeter Simons <simons@cryp.to>2011-10-26 09:15:25 +0000
commitdfd063cf12e15fb6973064de397b3f04f30dd370 (patch)
tree42d49c72148649f067a11ddf38029347f8778609 /pkgs/stdenv
parent706b80c28223486d84ae1e809323fc553b271438 (diff)
parent892889cf358e7858fee32e1c7fc83c53650ea706 (diff)
downloadnixlib-dfd063cf12e15fb6973064de397b3f04f30dd370.tar
nixlib-dfd063cf12e15fb6973064de397b3f04f30dd370.tar.gz
nixlib-dfd063cf12e15fb6973064de397b3f04f30dd370.tar.bz2
nixlib-dfd063cf12e15fb6973064de397b3f04f30dd370.tar.lz
nixlib-dfd063cf12e15fb6973064de397b3f04f30dd370.tar.xz
nixlib-dfd063cf12e15fb6973064de397b3f04f30dd370.tar.zst
nixlib-dfd063cf12e15fb6973064de397b3f04f30dd370.zip
synchronize with trunk
svn path=/nixpkgs/branches/stdenv-updates/; revision=30027
Diffstat (limited to 'pkgs/stdenv')
-rw-r--r--pkgs/stdenv/adapters.nix1
1 files changed, 1 insertions, 0 deletions
diff --git a/pkgs/stdenv/adapters.nix b/pkgs/stdenv/adapters.nix
index 3e596c4ef0ea..311d967c0a34 100644
--- 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;
     };