* 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, 4 insertions, 2 deletions

diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh
index 259417afaa3be..21611278c21b0 100644
--- a/pkgs/stdenv/generic/setup.sh
+++ b/pkgs/stdenv/generic/setup.sh
@@ -30,6 +30,7 @@ if test -z "$SHELL"; then echo "SHELL not set"; exit 1; fi
 
 
 # Hack: run gcc's setup hook.
+envHooks=()
 if test -f $NIX_GCC/nix-support/setup-hook; then
     . $NIX_GCC/nix-support/setup-hook
 fi
@@ -47,13 +48,12 @@ findInputs()
     
     if test -f $pkg/nix-support/propagated-build-inputs; then
         for i in $(cat $pkg/nix-support/propagated-build-inputs); do
-            addToEnv $pkg
+            findInputs $i
         done
     fi
 }
 
 pkgs=()
-envHooks=()
 for i in $buildinputs; do
     findInputs $i
 done
@@ -69,6 +69,8 @@ addToEnv()
         export _PATH=$_PATH:$1/bin
     fi
 
+    echo "${envHooks[@]}"
+
     for i in "${envHooks[@]}"; do
         $i $pkg
     done