* 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

2 files changed, 15 insertions, 7 deletions

diff --git a/pkgs/stdenv/generic/builder.sh b/pkgs/stdenv/generic/builder.sh
index ac9851607733..20145df08ab5 100755
--- a/pkgs/stdenv/generic/builder.sh
+++ b/pkgs/stdenv/generic/builder.sh
@@ -1,5 +1,11 @@
 #! /bin/sh
 
+p1=$param1
+p2=$param2
+p3=$param3
+p4=$param4
+p5=$param5
+
 . $stdenv/setup
 
 mkdir $out || exit 1
@@ -9,9 +15,9 @@ sed \
  -e "s^@postHook@^$postHook^g" \
  -e "s^@initialPath@^$initialPath^g" \
  -e "s^@gcc@^$gcc^g" \
- -e "s^@param1@^$param1^g" \
- -e "s^@param2@^$param2^g" \
- -e "s^@param3@^$param3^g" \
- -e "s^@param4@^$param4^g" \
- -e "s^@param5@^$param5^g" \
+ -e "s^@param1@^$p1^g" \
+ -e "s^@param2@^$p2^g" \
+ -e "s^@param3@^$p3^g" \
+ -e "s^@param4@^$p4^g" \
+ -e "s^@param5@^$p5^g" \
  < $setup > $out/setup || exit 1
diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh
index 259417afaa3b..21611278c21b 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