From 8df8943b92661f703399db514c0551a321ff54b6 Mon Sep 17 00:00:00 2001
From: Daniel Peebles <pumpkin@me.com>
Date: Sat, 27 Dec 2014 12:02:58 -0500
Subject: [PATCH] I think this should fix the evaluation errors in hydra

---
 pkgs/stdenv/darwin/default.nix |  6 +++---
 pkgs/stdenv/native/default.nix | 12 ++++++------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/pkgs/stdenv/darwin/default.nix b/pkgs/stdenv/darwin/default.nix
index 45d417cdce73..e7ee53178c77 100644
--- a/pkgs/stdenv/darwin/default.nix
+++ b/pkgs/stdenv/darwin/default.nix
@@ -18,7 +18,7 @@ import ../generic rec {
 
   system = stdenv.system;
 
-  gcc = import ../../build-support/gcc-wrapper {
+  cc = import ../../build-support/gcc-wrapper {
     nativeTools = false;
     nativeLibc = true;
     inherit stdenv;
@@ -34,8 +34,8 @@ import ../generic rec {
   fetchurlBoot = stdenv.fetchurlBoot;
 
   overrides = pkgs_: {
-    inherit gcc;
-    inherit (gcc) binutils;
+    inherit cc;
+    inherit (cc) binutils;
     inherit (pkgs)
       gzip bzip2 xz bash coreutils diffutils findutils gawk
       gnumake gnused gnutar gnugrep gnupatch perl libcxx libcxxabi;
diff --git a/pkgs/stdenv/native/default.nix b/pkgs/stdenv/native/default.nix
index 213f844365e1..45c8ebb70213 100644
--- a/pkgs/stdenv/native/default.nix
+++ b/pkgs/stdenv/native/default.nix
@@ -73,7 +73,7 @@ rec {
   # A function that builds a "native" stdenv (one that uses tools in
   # /usr etc.).
   makeStdenv =
-    { gcc, fetchurl, extraPath ? [], overrides ? (pkgs: { }) }:
+    { cc, fetchurl, extraPath ? [], overrides ? (pkgs: { }) }:
 
     import ../generic {
       preHook =
@@ -88,17 +88,17 @@ rec {
 
       fetchurlBoot = fetchurl;
 
-      inherit system shell gcc overrides config;
+      inherit system shell cc overrides config;
     };
 
 
   stdenvBoot0 = makeStdenv {
-    gcc = "/no-such-path";
+    cc = "/no-such-path";
     fetchurl = null;
   };
 
 
-  gcc = import ../../build-support/gcc-wrapper {
+  cc = import ../../build-support/gcc-wrapper {
     name = "gcc-native";
     nativeTools = true;
     nativeLibc = true;
@@ -116,7 +116,7 @@ rec {
 
   # First build a stdenv based only on tools outside the store.
   stdenvBoot1 = makeStdenv {
-    inherit gcc fetchurl;
+    inherit cc fetchurl;
   } // {inherit fetchurl;};
 
   stdenvBoot1Pkgs = allPackages {
@@ -129,7 +129,7 @@ rec {
   # systems don't have, so we mustn't rely on the native environment
   # providing it).
   stdenvBoot2 = makeStdenv {
-    inherit gcc fetchurl;
+    inherit cc fetchurl;
     extraPath = [ stdenvBoot1Pkgs.xz ];
     overrides = pkgs: { inherit (stdenvBoot1Pkgs) xz; };
   };