* gcc-wrapper now filters out -L and -I flags referring to paths

  outside the store (in pure builds).

svn path=/nixpkgs/trunk/; revision=817

1 files changed, 8 insertions, 1 deletions

diff --git a/pkgs/system/stdenvs.nix b/pkgs/system/stdenvs.nix
index 34804ad55d8..06a9fc50fed 100644
--- a/pkgs/system/stdenvs.nix
+++ b/pkgs/system/stdenvs.nix
@@ -8,12 +8,19 @@
 {system, allPackages}: rec {
 
 
+  # Trivial environment used for building other environments.
+  stdenvInitial = (import ../stdenv/initial) {
+    name = "stdenv-initial";
+    inherit system;
+  };
+
+
   # The native (i.e., impure) build environment.  This one uses the
   # tools installed on the system outside of the Nix environment,
   # i.e., the stuff in /bin, /usr/bin, etc.  This environment should
   # be used with care, since many Nix packages will not build properly
   # with it (e.g., because they require GNU Make).
-  stdenvNative = (import ../stdenv/native) {system = system;};
+  stdenvNative = (import ../stdenv/native) {stdenv = stdenvInitial;};
 
   stdenvNativePkgs = allPackages {system = system; stdenv = stdenvNative;};