about summary refs log tree commit diff
path: root/pkgs/stdenv/native
diff options
context:
space:
mode:
authorDaniel Peebles <pumpkin@me.com>2014-12-27 12:02:58 -0500
committerDaniel Peebles <pumpkin@me.com>2014-12-27 12:02:58 -0500
commit8df8943b92661f703399db514c0551a321ff54b6 (patch)
treee9080c064613ae460aff48f04e859affab13154f /pkgs/stdenv/native
parent30f621944b996c8cad3913e66e41d7035fcb4bcb (diff)
I think this should fix the evaluation errors in hydra
Diffstat (limited to 'pkgs/stdenv/native')
-rw-r--r--pkgs/stdenv/native/default.nix12
1 files changed, 6 insertions, 6 deletions
diff --git a/pkgs/stdenv/native/default.nix b/pkgs/stdenv/native/default.nix
index 213f844365e18..45c8ebb702138 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; };
   };