From 10d67f5c7a45460d03116b506de72ed8c7990e25 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 14 Jul 2006 09:28:09 +0000
Subject: [PATCH] * Reviving stdenvNix.

svn path=/nixpkgs/trunk/; revision=5702
---
 pkgs/stdenv/default.nix     | 7 +++++--
 pkgs/stdenv/nix/default.nix | 8 ++++----
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/pkgs/stdenv/default.nix b/pkgs/stdenv/default.nix
index cc24af174e5..ee41471d51c 100644
--- a/pkgs/stdenv/default.nix
+++ b/pkgs/stdenv/default.nix
@@ -39,8 +39,11 @@ rec {
   # The Nix build environment.
   stdenvNix = (import ./nix) {
     stdenv = stdenvNative;
-    pkgs = stdenvNativePkgs;
-    inherit genericStdenv gccWrapper;
+    pkgs = allPackages {
+      bootStdenv = removeAttrs stdenvNative ["gcc"]; # Hack
+      noSysDirs = false;
+    };
+    inherit genericStdenv;
   };
 
 
diff --git a/pkgs/stdenv/nix/default.nix b/pkgs/stdenv/nix/default.nix
index 6bcc366a51d..34109e2dbc7 100644
--- a/pkgs/stdenv/nix/default.nix
+++ b/pkgs/stdenv/nix/default.nix
@@ -1,4 +1,4 @@
-{stdenv, pkgs, genericStdenv, gccWrapper}:
+{stdenv, pkgs, genericStdenv}:
 
 genericStdenv {
   name = "stdenv-nix";
@@ -7,12 +7,12 @@ genericStdenv {
 
   inherit stdenv;
 
-  gcc = gccWrapper {
-    name = pkgs.gcc.name;
+  gcc = import ../../build-support/gcc-wrapper {
     nativeTools = false;
     nativeGlibc = true;
-    inherit (pkgs) gcc binutils;
     inherit stdenv;
+    inherit (pkgs) binutils;
+    gcc = pkgs.gcc.gcc;
     shell = pkgs.bash ~ /bin/sh;
   };