From 0d71e75222949f4e4a5ea8af8ac4666c3bb80579 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 19 Jan 2012 15:29:20 +0000
Subject: * Get rid of params1-5, they're obsolete.

svn path=/nixpkgs/branches/stdenv-updates/; revision=31700
---
 pkgs/stdenv/generic/builder.sh | 21 +++------------------
 1 file changed, 3 insertions(+), 18 deletions(-)

(limited to 'pkgs/stdenv/generic/builder.sh')

diff --git a/pkgs/stdenv/generic/builder.sh b/pkgs/stdenv/generic/builder.sh
index 01e86ce39986..82620f96ef5c 100644
--- a/pkgs/stdenv/generic/builder.sh
+++ b/pkgs/stdenv/generic/builder.sh
@@ -1,32 +1,17 @@
-p1=$param1
-p2=$param2
-p3=$param3
-p4=$param4
-p5=$param5
-_preHook="$preHook"
-_postHook="$postHook"
-preHook=
-postHook=
-
 export PATH=
 for i in $initialPath; do
-    if test "$i" = /; then i=; fi
+    if [ "$i" = / ]; then i=; fi
     PATH=$PATH${PATH:+:}$i/bin
 done
 
 mkdir $out
 
 sed \
-    -e "s^@preHook@^$_preHook^g" \
-    -e "s^@postHook@^$_postHook^g" \
+    -e "s^@preHook@^$preHook^g" \
+    -e "s^@postHook@^$postHook^g" \
     -e "s^@initialPath@^$initialPath^g" \
     -e "s^@gcc@^$gcc^g" \
     -e "s^@shell@^$shell^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"
 
 # Allow the user to install stdenv using nix-env and get the packages
-- 
cgit 1.4.1