* Started reorganising stdenv:

  - gcc/ld-wrappers have been factored out into a separate
    derivation.  This allows a working gcc to be installed in the user
    environment.  (Previously the Nix gcc didn't work because it
    needed a whole bunch of flags to point to glibc.)
    
  - Better modularity: packages can specify hooks into the setup
    scripts.  For instance, setup no longer knows about the
    PKG_CONFIG_PATH variable; pkgconfig can set it up instead.

  - gcc not longer depends on binutils.  This simplifies the bootstrap
    process.

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

2 files changed, 20 insertions, 0 deletions

diff --git a/pkgs/stdenv/initial/builder.sh b/pkgs/stdenv/initial/builder.sh
new file mode 100755
index 000000000000..8a9f7ab49188
--- /dev/null
+++ b/pkgs/stdenv/initial/builder.sh
@@ -0,0 +1,9 @@
+#! /bin/sh -e
+
+export PATH=/usr/bin:/bin
+
+mkdir $out
+cat > $out/setup <<EOF
+export PATH=/usr/bin:/bin
+EOF
+chmod +x $out/setup
diff --git a/pkgs/stdenv/initial/default.nix b/pkgs/stdenv/initial/default.nix
new file mode 100644
index 000000000000..da0771ce7d26
--- /dev/null
+++ b/pkgs/stdenv/initial/default.nix
@@ -0,0 +1,11 @@
+# Here we construct an absolutely trivial `initial' standard
+# environment.  It's not actually a functional stdenv, since there is
+# not necessarily a working C compiler.  We need this to build
+# gcc-wrapper et al. for the native stdenv.
+
+{system, name}:
+
+derivation {
+  inherit system name;
+  builder = ./builder.sh;
+}
\ No newline at end of file