* Finally got stdenv-nix-linux working again. Still not perfect,

  though.
* libxml2: upgrade to latest.
* octavefront/rna: keep debug info.

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

1 files changed, 15 insertions, 9 deletions

diff --git a/pkgs/stdenv/nix/default.nix b/pkgs/stdenv/nix/default.nix
index 2c5c70eb2bd0..5d454e26ce78 100644
--- a/pkgs/stdenv/nix/default.nix
+++ b/pkgs/stdenv/nix/default.nix
@@ -1,13 +1,19 @@
-{bootStdenv, pkgs}: (import ../generic) {
+{stdenv, pkgs}:
+
+(import ../generic) {
   name = "stdenv-nix";
-  system = bootStdenv.system;
-  prehook = ./prehook.sh;
-  posthook = ./posthook.sh;
+  preHook = ./prehook.sh;
   initialPath = (import ./path.nix) {pkgs = pkgs;};
+
+  inherit stdenv;
+
+  gcc = (import ../../build-support/gcc-wrapper) {
+    name = pkgs.gcc.name;
+    nativeTools = false;
+    nativeGlibc = true;
+    inherit (pkgs) gcc binutils;
+    inherit stdenv;
+  };
+
   param1 = pkgs.bash;
-  param2 = pkgs.gcc;
-  param3 = pkgs.binutils;
-  param4 = "";
-  param5 = "";
-  noSysDirs = false;
 }