* Merge the new generic builder.

* Removed substitute, it's part of the generic builder now.
* stdenv-initial (Linux): use the real generic builder script.  This
  does require that sed is in the path of the builder of the initial
  stdenv.

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

15 files changed, 160 insertions, 1537 deletions

diff --git a/pkgs/build-support/gcc-wrapper/builder.sh b/pkgs/build-support/gcc-wrapper/builder.sh
index 7ee0b0d32cd..f9dbc0e784f 100644
--- a/pkgs/build-support/gcc-wrapper/builder.sh
+++ b/pkgs/build-support/gcc-wrapper/builder.sh
@@ -1,10 +1,8 @@
 source $stdenv/setup
-source $substitute
 
 
-mkdir $out
-mkdir $out/bin
-mkdir $out/nix-support
+ensureDir $out/bin
+ensureDir $out/nix-support
 
 
 if test -z "$nativeLibc"; then
diff --git a/pkgs/build-support/gcc-wrapper/default.nix b/pkgs/build-support/gcc-wrapper/default.nix
index 2edd0049dc1..24309c7ab87 100644
--- a/pkgs/build-support/gcc-wrapper/default.nix
+++ b/pkgs/build-support/gcc-wrapper/default.nix
@@ -15,7 +15,6 @@ assert !nativeLibc -> libc != null;
 
 stdenv.mkDerivation {
   builder = ./builder.sh;
-  substitute = ../substitute/substitute.sh;
   setupHook = ./setup-hook.sh;
   gccWrapper = ./gcc-wrapper.sh;
   ldWrapper = ./ld-wrapper.sh;
diff --git a/pkgs/build-support/substitute/substitute.sh b/pkgs/build-support/substitute/substitute.sh
deleted file mode 100644
index c1a32488e1d..00000000000
--- a/pkgs/build-support/substitute/substitute.sh
+++ /dev/null
@@ -1,46 +0,0 @@
-substitute() {
-    input=$1
-    output=$2
-
-    params=("$@")
-
-    sedArgs=()
-    
-    for ((n = 2; n < ${#params[*]}; n += 1)); do
-        p=${params[$n]}
-
-        if test "$p" = "--replace"; then
-            pattern=${params[$((n + 1))]}
-            replacement=${params[$((n + 2))]}
-            n=$((n + 2))
-            sedArgs=("${sedArgs[@]}" "-e" "s^$pattern^$replacement^g")
-        fi
-
-        if test "$p" = "--subst-var"; then
-            varName=${params[$((n + 1))]}
-            n=$((n + 1))
-            sedArgs=("${sedArgs[@]}" "-e" "s^@${varName}@^${!varName}^g")
-        fi
-
-        if test "$p" = "--subst-var-by"; then
-            varName=${params[$((n + 1))]}
-            replacement=${params[$((n + 2))]}
-            n=$((n + 2))
-            sedArgs=("${sedArgs[@]}" "-e" "s^@${varName}@^$replacement^g")
-        fi
-
-    done
-
-    sed "${sedArgs[@]}" < "$input" > "$output".tmp
-    if test -x "$output"; then
-        chmod +x "$output".tmp
-    fi
-    mv -f "$output".tmp "$output"
-}
-
-
-substituteInPlace() {
-    fileName="$1"
-    shift
-    substitute "$fileName" "$fileName" "$@"
-}
diff --git a/pkgs/development/libraries/glibc/builder.sh b/pkgs/development/libraries/glibc/builder.sh
index c8dc3aa25a5..f8726fd31d2 100644
--- a/pkgs/development/libraries/glibc/builder.sh
+++ b/pkgs/development/libraries/glibc/builder.sh
@@ -3,7 +3,6 @@ export NIX_NO_SELF_RPATH=1
 export NIX_DONT_SET_RPATH=1
 
 source $stdenv/setup
-source $substitute
 
 # Explicitly tell glibc to use our pwd, not /bin/pwd.
 export PWD_P=$(type -tP pwd)
diff --git a/pkgs/development/libraries/glibc/default.nix b/pkgs/development/libraries/glibc/default.nix
index d1b57e02c52..086747e9dcc 100644
--- a/pkgs/development/libraries/glibc/default.nix
+++ b/pkgs/development/libraries/glibc/default.nix
@@ -6,7 +6,6 @@
 stdenv.mkDerivation {
   name = "glibc-2.5";
   builder = ./builder.sh;
-  substitute = ../../../build-support/substitute/substitute.sh;
 
   src = fetchurl {
     url = http://ftp.gnu.org/gnu/glibc/glibc-2.5.tar.bz2;
diff --git a/pkgs/development/libraries/pysqlite/builder.sh b/pkgs/development/libraries/pysqlite/builder.sh
index aab781eb55c..e1ca0e4a8fc 100644
--- a/pkgs/development/libraries/pysqlite/builder.sh
+++ b/pkgs/development/libraries/pysqlite/builder.sh
@@ -1,5 +1,4 @@
 source $stdenv/setup
-source $substitute
 
 configurePhase() {
 	substituteInPlace "setup.cfg" \
diff --git a/pkgs/development/libraries/pysqlite/default.nix b/pkgs/development/libraries/pysqlite/default.nix
index 2671e7a08c5..1a3e8c05dc3 100644
--- a/pkgs/development/libraries/pysqlite/default.nix
+++ b/pkgs/development/libraries/pysqlite/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, python, sqlite, substitute}:
+{stdenv, fetchurl, python, sqlite}:
 
 stdenv.mkDerivation {
   name = "pysqlite-2.2.2";
@@ -8,5 +8,5 @@ stdenv.mkDerivation {
   };
   builder = ./builder.sh;
 
-  inherit stdenv python sqlite substitute;
+  inherit stdenv python sqlite;
 }
diff --git a/pkgs/stdenv/generic/builder.sh b/pkgs/stdenv/generic/builder.sh
index 74df18ac838..ee2dbb3d0f9 100644
--- a/pkgs/stdenv/generic/builder.sh
+++ b/pkgs/stdenv/generic/builder.sh
@@ -5,7 +5,6 @@ p4=$param4
 p5=$param5
 
 source $stdenv/setup
-source $substitute
 
 mkdir $out
 
diff --git a/pkgs/stdenv/generic/default.nix b/pkgs/stdenv/generic/default.nix
index 0078b53fa22..3c476d5c1ab 100644
--- a/pkgs/stdenv/generic/default.nix
+++ b/pkgs/stdenv/generic/default.nix
@@ -15,8 +15,6 @@ let {
 
         builder = ./builder.sh;
 
-        substitute = ../../build-support/substitute/substitute.sh;
-
         setup = setupScript;
 
         inherit preHook postHook initialPath gcc shell;
diff --git a/pkgs/stdenv/generic/setup-new.sh b/pkgs/stdenv/generic/setup-new.sh
deleted file mode 100644
index dd302d06705..00000000000
--- a/pkgs/stdenv/generic/setup-new.sh
+++ /dev/null
@@ -1,660 +0,0 @@
-set -e
-
-test -z $NIX_GCC && NIX_GCC=@gcc@
-
-
-# Set up the initial path.
-PATH=
-for i in $NIX_GCC @initialPath@; do
-    PATH=$PATH${PATH:+:}$i/bin
-done
-
-if test "$NIX_DEBUG" = "1"; then
-    echo "Initial path: $PATH"
-fi
-
-
-# Execute the pre-hook.
-export SHELL=@shell@
-param1=@param1@
-param2=@param2@
-param3=@param3@
-param4=@param4@
-param5=@param5@
-if test -n "@preHook@"; then
-    source @preHook@
-fi
-
-
-# Check that the pre-hook initialised SHELL.
-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
-    source $NIX_GCC/nix-support/setup-hook
-fi
-
-    
-# Ensure that the given directory exists.
-ensureDir() {
-    local dir=$1
-    if ! test -x "$dir"; then mkdir -p "$dir"; fi
-}
-
-
-# Called when some build action fails.  If $succeedOnFailure is set,
-# create the file `$out/nix-support/failed' to signal failure, and
-# exit normally.  Otherwise, exit with failure.
-fail() {
-    exitCode=$?
-    if test "$succeedOnFailure" = 1; then
-        ensureDir "$out/nix-support"
-        touch "$out/nix-support/failed"
-        exit 0
-    else
-        exit $?
-    fi
-}
-
-
-# Allow the caller to augment buildInputs (it's not always possible to
-# do this before the call to setup.sh, since the PATH is empty at that
-# point; here we have a basic Unix environment).
-eval "$addInputsHook"
-
-
-# Recursively find all build inputs.
-findInputs()
-{
-    local pkg=$1
-
-    case $pkgs in
-        *\ $pkg\ *)
-            return 0
-            ;;
-    esac
-    
-    pkgs="$pkgs $pkg "
-
-    if test -f $pkg/nix-support/setup-hook; then
-        source $pkg/nix-support/setup-hook
-    fi
-    
-    if test -f $pkg/nix-support/propagated-build-inputs; then
-        for i in $(cat $pkg/nix-support/propagated-build-inputs); do
-            findInputs $i
-        done
-    fi
-}
-
-pkgs=""
-if test -n "$buildinputs"; then
-    buildInputs="$buildinputs" # compatibility
-fi
-for i in $buildInputs $propagatedBuildInputs; do
-    findInputs $i
-done
-
-
-# Set the relevant environment variables to point to the build inputs
-# found above.
-addToEnv()
-{
-    local pkg=$1
-
-    if test "$ignoreFailedInputs" != "1" -a -e $1/nix-support/failed; then
-        echo "failed input $1" >&2
-        fail
-    fi
-
-    if test -d $1/bin; then
-        export _PATH=$_PATH${_PATH:+:}$1/bin
-    fi
-
-    for i in "${envHooks[@]}"; do
-        $i $pkg
-    done
-}
-
-for i in $pkgs; do
-    addToEnv $i
-done
-
-
-# Add the output as an rpath.
-if test "$NIX_NO_SELF_RPATH" != "1"; then
-    export NIX_LDFLAGS="-rpath $out/lib $NIX_LDFLAGS"
-fi
-
-
-# Strip debug information by default.
-if test -z "$NIX_STRIP_DEBUG"; then
-    export NIX_STRIP_DEBUG=1
-    export NIX_CFLAGS_STRIP="-g0 -Wl,--strip-debug"
-fi
-
-
-# Do we know where the store is?  This is required for purity checking.
-if test -z "$NIX_STORE"; then
-    echo "Error: you have an old version of Nix that does not set the" \
-        "NIX_STORE variable.  Please upgrade." >&2
-    exit 1
-fi
-
-
-# We also need to know the root of the build directory for purity checking.
-if test -z "$NIX_BUILD_TOP"; then
-    echo "Error: you have an old version of Nix that does not set the" \
-        "NIX_BUILD_TOP variable.  Please upgrade." >&2
-    exit 1
-fi
-
-
-# Set the TZ (timezone) environment variable, otherwise commands like
-# `date' will complain (e.g., `Tue Mar 9 10:01:47 Local time zone must
-# be set--see zic manual page 2004').
-export TZ=UTC
-
-
-# Execute the post-hook.
-if test -n "@postHook@"; then
-    source @postHook@
-fi
-
-PATH=$_PATH${_PATH:+:}$PATH
-if test "$NIX_DEBUG" = "1"; then
-    echo "Final path: $PATH"
-fi
-
-
-######################################################################
-# What follows is the generic builder.
-
-
-nestingLevel=0
-
-startNest() {
-    nestingLevel=$(($nestingLevel + 1))
-    echo -en "\e[$1p"
-}
-
-stopNest() {
-    nestingLevel=$(($nestingLevel - 1))
-    echo -en "\e[q"
-}
-
-header() {
-    startNest "$2"
-    echo "$1"
-}
-
-# Make sure that even when we exit abnormally, the original nesting
-# level is properly restored.
-closeNest() {
-    while test $nestingLevel -gt 0; do
-        stopNest
-    done
-}
-
-trap "closeNest" EXIT
-
-
-# This function is useful for debugging broken Nix builds.  It dumps
-# all environment variables to a file `env-vars' in the build
-# directory.  If the build fails and the `-K' option is used, you can
-# then go to the build directory and source in `env-vars' to reproduce
-# the environment used for building.
-dumpVars() {
-    if test "$noDumpEnvVars" != "1"; then
-        export > $NIX_BUILD_TOP/env-vars
-    fi
-}
-
-
-# Redirect stdout/stderr to a named pipe connected to a `tee' process
-# that writes the specified file (and also to our original stdout).
-# The original stdout is saved in descriptor 3.
-startLog() {
-    local logFile=${logNr}_$1
-    logNr=$((logNr + 1))
-    if test "$logPhases" = 1; then
-        ensureDir $logDir
-
-        exec 3>&1
-
-        if test "$dontLogThroughTee" != 1; then
-            # This required named pipes (fifos).
-            logFifo=$NIX_BUILD_TOP/log_fifo
-            test -p $logFifo || mkfifo $logFifo
-            startLogWrite "$logDir/$logFile" "$logFifo"
-            exec > $logFifo 2>&1
-        else
-            exec > $logDir/$logFile 2>&1
-        fi
-    fi
-}
-
-# Factored into a separate function so that it can be overriden.
-startLogWrite() {
-    tee "$1" < "$2" &
-    logWriterPid=$!
-}
-
-
-if test -z "$logDir"; then
-    logDir=$out/log
-fi
-
-logNr=0
-
-# Restore the original stdout/stderr.
-stopLog() {
-    if test "$logPhases" = 1; then
-        exec >&3 2>&1
-
-        # Wait until the tee process has died.  Otherwise output from
-        # different phases may be mixed up.
-        if test -n "$logWriterPid"; then
-            wait $logWriterPid
-            logWriterPid=
-            rm $logFifo
-        fi
-    fi
-}
-
-
-# Utility function: return the base name of the given path, with the
-# prefix `HASH-' removed, if present.
-stripHash() {
-    strippedName=$(basename $1);
-    if echo "$strippedName" | grep -q '^[a-z0-9]\{32\}-'; then
-        strippedName=$(echo "$strippedName" | cut -c34-)
-    fi
-}
-
-
-unpackFile() {
-    local file=$1
-    local cmd
-
-    header "unpacking source archive $file" 3
-
-    case $file in
-        *.tar)
-            tar xvf $file || fail
-            ;;
-        *.tar.gz | *.tgz | *.tar.Z)
-            gunzip < $file | tar xvf - || fail
-            ;;
-        *.tar.bz2 | *.tbz2)
-            bunzip2 < $file | tar xvf - || fail
-            ;;
-        *.zip)
-            unzip $file || fail
-            ;;
-        *)
-            if test -d "$file"; then
-                stripHash $file
-                cp -prvd $file $strippedName || fail
-            else
-                if test -n "$findUnpacker"; then
-                    $findUnpacker $1;
-                fi
-                if test -z "$unpackCmd"; then
-                    echo "source archive $file has unknown type"
-                    exit 1
-                fi
-                $unpackCmd || fail
-            fi
-            ;;
-    esac
-
-    stopNest
-}
-
-
-unpackW() {
-    if test -n "$unpackPhase"; then
-        eval "$unpackPhase"
-        return
-    fi
-
-    if test -z "$srcs"; then
-        if test -z "$src"; then
-            echo 'variable $src or $srcs should point to the source'
-            exit 1
-        fi
-        srcs="$src"
-    fi
-
-    # To determine the source directory created by unpacking the
-    # source archives, we record the contents of the current
-    # directory, then look below which directory got added.  Yeah,
-    # it's rather hacky.
-    local dirsBefore=""
-    for i in *; do
-        if test -d "$i"; then
-            dirsBefore="$dirsBefore $i "
-        fi
-    done
-
-    # Unpack all source archives.
-    for i in $srcs; do
-        unpackFile $i
-    done
-
-    # Find the source directory.
-    if test -n "$setSourceRoot"; then
-        eval "$setSourceRoot"
-    else
-        sourceRoot=
-        for i in *; do
-            if test -d "$i"; then
-                case $dirsBefore in
-                    *\ $i\ *)
-                        ;;
-                    *)
-                        if test -n "$sourceRoot"; then
-                            echo "unpacker produced multiple directories"
-                            exit 1
-                        fi
-                        sourceRoot=$i
-                        ;;
-                esac
-            fi
-        done
-    fi
-
-    if test -z "$sourceRoot"; then
-        echo "unpacker appears to have produced no directories"
-        exit 1
-    fi
-
-    echo "source root is $sourceRoot"
-
-    # By default, add write permission to the sources.  This is often
-    # necessary when sources have been copied from other store
-    # locations.
-    if test "dontMakeSourcesWritable" != 1; then
-        chmod -R +w $sourceRoot
-    fi
-
-    eval "$postUnpack"
-}
-
-
-unpackPhase() {
-    header "unpacking sources"
-    startLog "unpack"
-    unpackW
-    stopLog
-    stopNest
-}
-
-
-patchW() {
-    if test -n "$patchPhase"; then
-        eval "$patchPhase"
-        return
-    fi
-
-    for i in $patches; do
-        header "applying patch $i" 3
-        local uncompress=cat
-        case $i in
-            *.gz)
-                uncompress=gunzip
-                ;;
-            *.bz2)
-                uncompress=bunzip2
-                ;;
-        esac
-        $uncompress < $i | patch -p1 || fail
-        stopNest
-    done
-}
-
-
-patchPhase() {
-    if test -z "$patchPhase" -a -z "$patches"; then return; fi
-    header "patching sources"
-    startLog "patch"
-    patchW
-    stopLog
-    stopNest
-}
-
-
-fixLibtool() {
-    sed 's^eval sys_lib_.*search_path=.*^^' < $1 > $1.tmp
-    mv $1.tmp $1
-}
-
-
-configureW() {
-    if test -n "$configurePhase"; then
-        eval "$configurePhase"
-        return
-    fi
-
-    eval "$preConfigure"
-
-    if test -z "$prefix"; then
-        prefix="$out";
-    fi
-
-    if test "$useTempPrefix" = "1"; then
-        prefix="$NIX_BUILD_TOP/tmp_prefix";
-    fi
-
-    if test -z "$configureScript"; then
-        configureScript=./configure
-        if ! test -x $configureScript; then
-            echo "no configure script, doing nothing"
-            return
-        fi
-    fi
-
-    if test -z "$dontFixLibtool"; then
-        for i in $(find . -name "ltmain.sh"); do
-            echo "fixing libtool script $i"
-            fixLibtool $i
-        done
-    fi
-
-    if test -z "$dontAddPrefix"; then
-        configureFlags="--prefix=$prefix $configureFlags"
-    fi
-
-    echo "configure flags: $configureFlags ${configureFlagsArray[@]}"
-    $configureScript $configureFlags"${configureFlagsArray[@]}" || fail
-
-    eval "$postConfigure"
-}
-
-
-configurePhase() {
-    header "configuring"
-    startLog "configure"
-    configureW
-    stopLog
-    stopNest
-}
-
-
-buildW() {
-    if test -n "$buildPhase"; then
-        eval "$buildPhase"
-        return
-    fi
-
-    eval "$preBuild"
-    
-    echo "make flags: $makeFlags ${makeFlagsArray[@]}"
-    make $makeFlags "${makeFlagsArray[@]}" || fail
-
-    eval "$postBuild"
-}
-
-
-buildPhase() {
-    if test "$dontBuild" = 1; then
-        return
-    fi
-    header "building"
-    startLog "build"
-    buildW
-    stopLog
-    stopNest
-}
-
-
-checkW() {
-    if test -n "$checkPhase"; then
-        eval "$checkPhase"
-        return
-    fi
-
-    if test -z "$checkTarget"; then
-        checkTarget="check"
-    fi
-
-    echo "check flags: $checkFlags ${checkFlagsArray[@]}"
-    make $checkFlags "${checkFlagsArray[@]}" $checkTarget || fail
-}
-
-
-checkPhase() {
-    if test "$doCheck" != 1; then
-        return
-    fi
-    header "checking"
-    startLog "check"
-    checkW
-    stopLog
-    stopNest
-}
-
-
-patchELF() {
-    # Patch all ELF executables and shared libraries.
-    header "patching ELF executables and libraries"
-    find "$prefix" \( \
-        \( -type f -a -name "*.so*" \) -o \
-        \( -type f -a -perm +0100 \) \
-        \) -print -exec patchelf --shrink-rpath {} \;
-    stopNest
-}
-
-
-installW() {
-    if test -n "$installPhase"; then
-        eval "$installPhase"
-        return
-    fi
-
-    eval "$preInstall"
-
-    ensureDir "$prefix"
-    
-    if test -z "$dontMakeInstall"; then
-        echo "install flags: $installFlags ${installFlagsArray[@]}"
-        make install $installFlags "${installFlagsArray[@]}" || fail
-    fi
-
-    if test -z "$dontStrip" -a "$NIX_STRIP_DEBUG" = 1; then
-        find "$prefix" -name "*.a" -exec echo stripping {} \; \
-            -exec strip -S {} \; || fail
-    fi
-
-    if test "$havePatchELF" = 1 -a -z "$dontPatchELF"; then
-        patchELF "$prefix"
-    fi
-
-    if test -n "$propagatedBuildInputs"; then
-        ensureDir "$out/nix-support"
-        echo "$propagatedBuildInputs" > "$out/nix-support/propagated-build-inputs"
-    fi
-
-    eval "$postInstall"
-}
-
-
-installPhase() {
-    if test "$dontInstall" = 1; then
-        return
-    fi
-    header "installing"
-    startLog "install"
-    installW
-    stopLog
-    stopNest
-}
-
-
-distW() {
-    if test -n "$distPhase"; then
-        eval "$distPhase"
-        return
-    fi
-
-    eval "$preDist"
-    
-    if test -z "$distTarget"; then
-        distTarget="dist"
-    fi
-
-    echo "dist flags: $distFlags ${distFlagsArray[@]}"
-    make $distFlags "${distFlagsArray[@]}" $distTarget || fail
-
-    if test "$dontCopyDist" != 1; then
-        ensureDir "$out/tarballs"
-
-        if test -z "$tarballs"; then
-            tarballs="*.tar.gz"
-        fi
-
-        # Note: don't quote $tarballs, since we explicitly permit
-        # wildcards in there.
-        cp -pvd $tarballs $out/tarballs
-    fi
-
-    eval "$postDist"
-}
-
-
-distPhase() {
-    if test "$doDist" != 1; then
-        return
-    fi
-    header "creating distribution"
-    startLog "dist"
-    distW
-    stopLog
-    stopNest
-}
-
-
-genericBuild() {
-    header "building $out"
-
-    unpackPhase
-    cd $sourceRoot
-
-    if test -z "$phases"; then
-        phases="patchPhase configurePhase buildPhase checkPhase \
-            installPhase distPhase";
-    fi
-
-    for i in $phases; do
-        dumpVars
-        eval "$i"
-    done
-    
-    stopNest
-}
-
-
-dumpVars
diff --git a/pkgs/stdenv/generic/setup-new2.sh b/pkgs/stdenv/generic/setup-new2.sh
deleted file mode 100644
index 1eb2ad003d9..00000000000
--- a/pkgs/stdenv/generic/setup-new2.sh
+++ /dev/null
@@ -1,781 +0,0 @@
-set -e
-
-test -z $NIX_GCC && NIX_GCC=@gcc@
-
-
-# Set up the initial path.
-PATH=
-for i in $NIX_GCC @initialPath@; do
-    PATH=$PATH${PATH:+:}$i/bin
-done
-
-if test "$NIX_DEBUG" = "1"; then
-    echo "Initial path: $PATH"
-fi
-
-
-# Execute the pre-hook.
-export SHELL=@shell@
-export shell=@shell@
-param1=@param1@
-param2=@param2@
-param3=@param3@
-param4=@param4@
-param5=@param5@
-if test -n "@preHook@"; then
-    source @preHook@
-fi
-
-
-# Check that the pre-hook initialised SHELL.
-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
-    source $NIX_GCC/nix-support/setup-hook
-fi
-
-    
-# Ensure that the given directory exists.
-ensureDir() {
-    local dir=$1
-    if ! test -x "$dir"; then mkdir -p "$dir"; fi
-}
-
-
-# Called when some build action fails.  If $succeedOnFailure is set,
-# create the file `$out/nix-support/failed' to signal failure, and
-# exit normally.  Otherwise, exit with failure.
-fail() {
-    exitCode=$?
-    if test "$succeedOnFailure" = 1; then
-        ensureDir "$out/nix-support"
-        touch "$out/nix-support/failed"
-        exit 0
-    else
-        exit $?
-    fi
-}
-
-
-# Allow the caller to augment buildInputs (it's not always possible to
-# do this before the call to setup.sh, since the PATH is empty at that
-# point; here we have a basic Unix environment).
-eval "$addInputsHook"
-
-
-# Recursively find all build inputs.
-findInputs()
-{
-    local pkg=$1
-
-    case $pkgs in
-        *\ $pkg\ *)
-            return 0
-            ;;
-    esac
-    
-    pkgs="$pkgs $pkg "
-
-    if test -f $pkg/nix-support/setup-hook; then
-        source $pkg/nix-support/setup-hook
-    fi
-    
-    if test -f $pkg/nix-support/propagated-build-inputs; then
-        for i in $(cat $pkg/nix-support/propagated-build-inputs); do
-            findInputs $i
-        done
-    fi
-}
-
-pkgs=""
-if test -n "$buildinputs"; then
-    buildInputs="$buildinputs" # compatibility
-fi
-for i in $buildInputs $propagatedBuildInputs; do
-    findInputs $i
-done
-
-
-# Set the relevant environment variables to point to the build inputs
-# found above.
-addToEnv()
-{
-    local pkg=$1
-
-    if test "$ignoreFailedInputs" != "1" -a -e $1/nix-support/failed; then
-        echo "failed input $1" >&2
-        fail
-    fi
-
-    if test -d $1/bin; then
-        export _PATH=$_PATH${_PATH:+:}$1/bin
-    fi
-
-    for i in "${envHooks[@]}"; do
-        $i $pkg
-    done
-}
-
-for i in $pkgs; do
-    addToEnv $i
-done
-
-
-# Add the output as an rpath.
-if test "$NIX_NO_SELF_RPATH" != "1"; then
-    export NIX_LDFLAGS="-rpath $out/lib $NIX_LDFLAGS"
-fi
-
-
-# Strip debug information by default.
-if test -z "$NIX_STRIP_DEBUG"; then
-    export NIX_STRIP_DEBUG=1
-    export NIX_CFLAGS_STRIP="-g0 -Wl,--strip-debug"
-fi
-
-
-# Do we know where the store is?  This is required for purity checking.
-if test -z "$NIX_STORE"; then
-    echo "Error: you have an old version of Nix that does not set the" \
-        "NIX_STORE variable.  Please upgrade." >&2
-    exit 1
-fi
-
-
-# We also need to know the root of the build directory for purity checking.
-if test -z "$NIX_BUILD_TOP"; then
-    echo "Error: you have an old version of Nix that does not set the" \
-        "NIX_BUILD_TOP variable.  Please upgrade." >&2
-    exit 1
-fi
-
-
-# Set the TZ (timezone) environment variable, otherwise commands like
-# `date' will complain (e.g., `Tue Mar 9 10:01:47 Local time zone must
-# be set--see zic manual page 2004').
-export TZ=UTC
-
-
-# Execute the post-hook.
-if test -n "@postHook@"; then
-    source @postHook@
-fi
-
-PATH=$_PATH${_PATH:+:}$PATH
-if test "$NIX_DEBUG" = "1"; then
-    echo "Final path: $PATH"
-fi
-
-
-######################################################################
-# Textual substitution functions.
-
-
-substitute() {
-    local input="$1"
-    local output="$2"
-
-    local params=("$@")
-
-    local sedScript=$NIX_BUILD_TOP/.sedargs
-    rm -f $sedScript
-    touch $sedScript
-
-    local n p pattern replacement varName
-    
-    for ((n = 2; n < ${#params[*]}; n += 1)); do
-        p=${params[$n]}
-
-        if test "$p" = "--replace"; then
-            pattern=${params[$((n + 1))]}
-            replacement=${params[$((n + 2))]}
-            n=$((n + 2))
-            echo "s^$pattern^$replacement^g" >> $sedScript
-            sedArgs=("${sedArgs[@]}" "-e" )
-        fi
-
-        if test "$p" = "--subst-var"; then
-            varName=${params[$((n + 1))]}
-            n=$((n + 1))
-            echo "s^@${varName}@^${!varName}^g" >> $sedScript
-        fi
-
-        if test "$p" = "--subst-var-by"; then
-            varName=${params[$((n + 1))]}
-            replacement=${params[$((n + 2))]}
-            n=$((n + 2))
-            echo "s^@${varName}@^$replacement^g" >> $sedScript
-        fi
-
-    done
-
-    sed -f $sedScript < "$input" > "$output".tmp
-    if test -x "$output"; then
-        chmod +x "$output".tmp
-    fi
-    mv -f "$output".tmp "$output"
-}
-
-
-substituteInPlace() {
-    local fileName="$1"
-    shift
-    substitute "$fileName" "$fileName" "$@"
-}
-
-
-substituteAll() {
-    local input="$1"
-    local output="$2"
-    
-    # Select all environment variables that start with a lowercase character.
-    for envVar in $(env | sed "s/^[^a-z].*//" | sed "s/^\([^=]*\)=.*/\1/"); do
-        if test "$NIX_DEBUG" = "1"; then
-            echo "$envVar -> ${!envVar}"
-        fi
-        args="$args --subst-var $envVar"
-    done
-
-    substitute "$input" "$output" $args
-}  
-
-
-######################################################################
-# What follows is the generic builder.
-
-
-nestingLevel=0
-
-startNest() {
-    nestingLevel=$(($nestingLevel + 1))
-    echo -en "\e[$1p"
-}
-
-stopNest() {
-    nestingLevel=$(($nestingLevel - 1))
-    echo -en "\e[q"
-}
-
-header() {
-    startNest "$2"
-    echo "$1"
-}
-
-# Make sure that even when we exit abnormally, the original nesting
-# level is properly restored.
-closeNest() {
-    while test $nestingLevel -gt 0; do
-        stopNest
-    done
-}
-
-trap "closeNest" EXIT
-
-
-# This function is useful for debugging broken Nix builds.  It dumps
-# all environment variables to a file `env-vars' in the build
-# directory.  If the build fails and the `-K' option is used, you can
-# then go to the build directory and source in `env-vars' to reproduce
-# the environment used for building.
-dumpVars() {
-    if test "$noDumpEnvVars" != "1"; then
-        export > $NIX_BUILD_TOP/env-vars
-    fi
-}
-
-
-# Redirect stdout/stderr to a named pipe connected to a `tee' process
-# that writes the specified file (and also to our original stdout).
-# The original stdout is saved in descriptor 3.
-startLog() {
-    local logFile=${logNr}_$1
-    logNr=$((logNr + 1))
-    if test "$logPhases" = 1; then
-        ensureDir $logDir
-
-        exec 3>&1
-
-        if test "$dontLogThroughTee" != 1; then
-            # This required named pipes (fifos).
-            logFifo=$NIX_BUILD_TOP/log_fifo
-            test -p $logFifo || mkfifo $logFifo
-            startLogWrite "$logDir/$logFile" "$logFifo"
-            exec > $logFifo 2>&1
-        else
-            exec > $logDir/$logFile 2>&1
-        fi
-    fi
-}
-
-# Factored into a separate function so that it can be overriden.
-startLogWrite() {
-    tee "$1" < "$2" &
-    logWriterPid=$!
-}
-
-
-if test -z "$logDir"; then
-    logDir=$out/log
-fi
-
-logNr=0
-
-# Restore the original stdout/stderr.
-stopLog() {
-    if test "$logPhases" = 1; then
-        exec >&3 2>&1
-
-        # Wait until the tee process has died.  Otherwise output from
-        # different phases may be mixed up.
-        if test -n "$logWriterPid"; then
-            wait $logWriterPid
-            logWriterPid=
-            rm $logFifo
-        fi
-    fi
-}
-
-
-# Utility function: return the base name of the given path, with the
-# prefix `HASH-' removed, if present.
-stripHash() {
-    strippedName=$(basename $1);
-    if echo "$strippedName" | grep -q '^[a-z0-9]\{32\}-'; then
-        strippedName=$(echo "$strippedName" | cut -c34-)
-    fi
-}
-
-
-unpackFile() {
-    local file=$1
-    local cmd
-
-    header "unpacking source archive $file" 3
-
-    case $file in
-        *.tar)
-            tar xvf $file || fail
-            ;;
-        *.tar.gz | *.tgz | *.tar.Z)
-            gunzip < $file | tar xvf - || fail
-            ;;
-        *.tar.bz2 | *.tbz2)
-            bunzip2 < $file | tar xvf - || fail
-            ;;
-        *.zip)
-            unzip $file || fail
-            ;;
-        *)
-            if test -d "$file"; then
-                stripHash $file
-                cp -prvd $file $strippedName || fail
-            else
-                if test -n "$findUnpacker"; then
-                    $findUnpacker $1;
-                fi
-                if test -z "$unpackCmd"; then
-                    echo "source archive $file has unknown type"
-                    exit 1
-                fi
-                $unpackCmd || fail
-            fi
-            ;;
-    esac
-
-    stopNest
-}
-
-
-unpackW() {
-    if test -n "$unpackPhase"; then
-        eval "$unpackPhase"
-        return
-    fi
-
-    if test -z "$srcs"; then
-        if test -z "$src"; then
-            echo 'variable $src or $srcs should point to the source'
-            exit 1
-        fi
-        srcs="$src"
-    fi
-
-    # To determine the source directory created by unpacking the
-    # source archives, we record the contents of the current
-    # directory, then look below which directory got added.  Yeah,
-    # it's rather hacky.
-    local dirsBefore=""
-    for i in *; do
-        if test -d "$i"; then
-            dirsBefore="$dirsBefore $i "
-        fi
-    done
-
-    # Unpack all source archives.
-    for i in $srcs; do
-        unpackFile $i
-    done
-
-    # Find the source directory.
-    if test -n "$setSourceRoot"; then
-        eval "$setSourceRoot"
-    else
-        sourceRoot=
-        for i in *; do
-            if test -d "$i"; then
-                case $dirsBefore in
-                    *\ $i\ *)
-                        ;;
-                    *)
-                        if test -n "$sourceRoot"; then
-                            echo "unpacker produced multiple directories"
-                            exit 1
-                        fi
-                        sourceRoot=$i
-                        ;;
-                esac
-            fi
-        done
-    fi
-
-    if test -z "$sourceRoot"; then
-        echo "unpacker appears to have produced no directories"
-        exit 1
-    fi
-
-    echo "source root is $sourceRoot"
-
-    # By default, add write permission to the sources.  This is often
-    # necessary when sources have been copied from other store
-    # locations.
-    if test "dontMakeSourcesWritable" != 1; then
-        chmod -R +w $sourceRoot
-    fi
-
-    eval "$postUnpack"
-}
-
-
-unpackPhase() {
-    header "unpacking sources"
-    startLog "unpack"
-    unpackW
-    stopLog
-    stopNest
-}
-
-
-patchW() {
-    if test -n "$patchPhase"; then
-        eval "$patchPhase"
-        return
-    fi
-
-    if test -z "$patchFlags"; then
-        patchFlags="-p1"
-    fi
-
-    for i in $patches; do
-        header "applying patch $i" 3
-        local uncompress=cat
-        case $i in
-            *.gz)
-                uncompress=gunzip
-                ;;
-            *.bz2)
-                uncompress=bunzip2
-                ;;
-        esac
-        $uncompress < $i | patch $patchFlags || fail
-        stopNest
-    done
-}
-
-
-patchPhase() {
-    if test -z "$patchPhase" -a -z "$patches"; then return; fi
-    header "patching sources"
-    startLog "patch"
-    patchW
-    stopLog
-    stopNest
-}
-
-
-fixLibtool() {
-    sed 's^eval sys_lib_.*search_path=.*^^' < $1 > $1.tmp
-    mv $1.tmp $1
-}
-
-
-configureW() {
-    if test -n "$configurePhase"; then
-        eval "$configurePhase"
-        return
-    fi
-
-    eval "$preConfigure"
-
-    if test -z "$prefix"; then
-        prefix="$out";
-    fi
-
-    if test "$useTempPrefix" = "1"; then
-        prefix="$NIX_BUILD_TOP/tmp_prefix";
-    fi
-
-    if test -z "$configureScript"; then
-        configureScript=./configure
-        if ! test -x $configureScript; then
-            echo "no configure script, doing nothing"
-            return
-        fi
-    fi
-
-    if test -z "$dontFixLibtool"; then
-        for i in $(find . -name "ltmain.sh"); do
-            echo "fixing libtool script $i"
-            fixLibtool $i
-        done
-    fi
-
-    if test -z "$dontAddPrefix"; then
-        configureFlags="--prefix=$prefix $configureFlags"
-    fi
-
-    echo "configure flags: $configureFlags ${configureFlagsArray[@]}"
-    $configureScript $configureFlags"${configureFlagsArray[@]}" || fail
-
-    eval "$postConfigure"
-}
-
-
-configurePhase() {
-    header "configuring"
-    startLog "configure"
-    configureW
-    stopLog
-    stopNest
-}
-
-
-buildW() {
-    if test -n "$buildPhase"; then
-        eval "$buildPhase"
-        return
-    fi
-
-    eval "$preBuild"
-    
-    echo "make flags: $makeFlags ${makeFlagsArray[@]} $buildFlags ${buildFlagsArray[@]}"
-    make \
-        $makeFlags "${makeFlagsArray[@]}" \
-        $buildFlags "${buildFlagsArray[@]}" || fail
-
-    eval "$postBuild"
-}
-
-
-buildPhase() {
-    if test "$dontBuild" = 1; then
-        return
-    fi
-    header "building"
-    startLog "build"
-    buildW
-    stopLog
-    stopNest
-}
-
-
-checkW() {
-    if test -n "$checkPhase"; then
-        eval "$checkPhase"
-        return
-    fi
-
-    if test -z "$checkTarget"; then
-        checkTarget="check"
-    fi
-
-    echo "check flags: $makeFlags ${makeFlagsArray[@]} $checkFlags ${checkFlagsArray[@]}"
-    make \
-        $makeFlags "${makeFlagsArray[@]}" \
-        $checkFlags "${checkFlagsArray[@]}" $checkTarget || fail
-}
-
-
-checkPhase() {
-    if test "$doCheck" != 1; then
-        return
-    fi
-    header "checking"
-    startLog "check"
-    checkW
-    stopLog
-    stopNest
-}
-
-
-patchELF() {
-    # Patch all ELF executables and shared libraries.
-    header "patching ELF executables and libraries"
-    find "$prefix" \( \
-        \( -type f -a -name "*.so*" \) -o \
-        \( -type f -a -perm +0100 \) \
-        \) -print -exec patchelf --shrink-rpath {} \;
-    stopNest
-}
-
-
-installW() {
-    if test -n "$installPhase"; then
-        eval "$installPhase"
-        return
-    fi
-
-    eval "$preInstall"
-
-    ensureDir "$prefix"
-
-    if test -z "$installCommand"; then
-        if test -z "$installTargets"; then
-            installTargets=install
-        fi
-        echo "install flags: $installTargets $makeFlags ${makeFlagsArray[@]} $installFlags ${installFlagsArray[@]}"
-        make $installTargets \
-            $makeFlags "${makeFlagsArray[@]}" \
-            $installFlags "${installFlagsArray[@]}" || fail
-    else
-        eval "$installCommand"
-    fi
-
-    eval "$postInstall"
-}
-
-
-installPhase() {
-    if test "$dontInstall" = 1; then
-        return
-    fi
-    header "installing"
-    startLog "install"
-    installW
-    stopLog
-    stopNest
-}
-
-
-# The fixup phase performs generic, package-independent, Nix-related
-# stuff, like running patchelf and setting the
-# propagated-build-inputs.  It should rarely be overriden.
-fixupW() {
-    if test -n "$fixupPhase"; then
-        eval "$fixupPhase"
-        return
-    fi
-
-    eval "$preFixup"
-
-    if test -z "$dontStrip" -a "$NIX_STRIP_DEBUG" = 1; then
-        find "$prefix" -name "*.a" -exec echo stripping {} \; \
-            -exec strip -S {} \; || fail
-    fi
-
-    if test "$havePatchELF" = 1 -a -z "$dontPatchELF"; then
-        patchELF "$prefix"
-    fi
-
-    if test -n "$propagatedBuildInputs"; then
-        ensureDir "$out/nix-support"
-        echo "$propagatedBuildInputs" > "$out/nix-support/propagated-build-inputs"
-    fi
-
-    eval "$postFixup"
-}
-
-
-fixupPhase() {
-    if test "$dontFixup" = 1; then
-        return
-    fi
-    header "post-installation fixup"
-    startLog "fixup"
-    fixupW
-    stopLog
-    stopNest
-}
-
-
-distW() {
-    if test -n "$distPhase"; then
-        eval "$distPhase"
-        return
-    fi
-
-    eval "$preDist"
-    
-    if test -z "$distTarget"; then
-        distTarget="dist"
-    fi
-
-    echo "dist flags: $distFlags ${distFlagsArray[@]}"
-    make $distFlags "${distFlagsArray[@]}" $distTarget || fail
-
-    if test "$dontCopyDist" != 1; then
-        ensureDir "$out/tarballs"
-
-        if test -z "$tarballs"; then
-            tarballs="*.tar.gz"
-        fi
-
-        # Note: don't quote $tarballs, since we explicitly permit
-        # wildcards in there.
-        cp -pvd $tarballs $out/tarballs
-    fi
-
-    eval "$postDist"
-}
-
-
-distPhase() {
-    if test "$doDist" != 1; then
-        return
-    fi
-    header "creating distribution"
-    startLog "dist"
-    distW
-    stopLog
-    stopNest
-}
-
-
-genericBuild() {
-    header "building $out"
-
-    if test -n "$buildCommand"; then
-        eval "$buildCommand"
-        return
-    fi
-
-    unpackPhase
-    cd $sourceRoot
-
-    if test -z "$phases"; then
-        phases="patchPhase configurePhase buildPhase checkPhase \
-            installPhase fixupPhase distPhase";
-    fi
-
-    for i in $phases; do
-        dumpVars
-        eval "$i"
-    done
-    
-    stopNest
-}
-
-
-dumpVars
diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh
index b0301265cfd..1eb2ad003d9 100644
--- a/pkgs/stdenv/generic/setup.sh
+++ b/pkgs/stdenv/generic/setup.sh
@@ -16,6 +16,7 @@ fi
 
 # Execute the pre-hook.
 export SHELL=@shell@
+export shell=@shell@
 param1=@param1@
 param2=@param2@
 param3=@param3@
@@ -170,6 +171,79 @@ fi
 
 
 ######################################################################
+# Textual substitution functions.
+
+
+substitute() {
+    local input="$1"
+    local output="$2"
+
+    local params=("$@")
+
+    local sedScript=$NIX_BUILD_TOP/.sedargs
+    rm -f $sedScript
+    touch $sedScript
+
+    local n p pattern replacement varName
+    
+    for ((n = 2; n < ${#params[*]}; n += 1)); do
+        p=${params[$n]}
+
+        if test "$p" = "--replace"; then
+            pattern=${params[$((n + 1))]}
+            replacement=${params[$((n + 2))]}
+            n=$((n + 2))
+            echo "s^$pattern^$replacement^g" >> $sedScript
+            sedArgs=("${sedArgs[@]}" "-e" )
+        fi
+
+        if test "$p" = "--subst-var"; then
+            varName=${params[$((n + 1))]}
+            n=$((n + 1))
+            echo "s^@${varName}@^${!varName}^g" >> $sedScript
+        fi
+
+        if test "$p" = "--subst-var-by"; then
+            varName=${params[$((n + 1))]}
+            replacement=${params[$((n + 2))]}
+            n=$((n + 2))
+            echo "s^@${varName}@^$replacement^g" >> $sedScript
+        fi
+
+    done
+
+    sed -f $sedScript < "$input" > "$output".tmp
+    if test -x "$output"; then
+        chmod +x "$output".tmp
+    fi
+    mv -f "$output".tmp "$output"
+}
+
+
+substituteInPlace() {
+    local fileName="$1"
+    shift
+    substitute "$fileName" "$fileName" "$@"
+}
+
+
+substituteAll() {
+    local input="$1"
+    local output="$2"
+    
+    # Select all environment variables that start with a lowercase character.
+    for envVar in $(env | sed "s/^[^a-z].*//" | sed "s/^\([^=]*\)=.*/\1/"); do
+        if test "$NIX_DEBUG" = "1"; then
+            echo "$envVar -> ${!envVar}"
+        fi
+        args="$args --subst-var $envVar"
+    done
+
+    substitute "$input" "$output" $args
+}  
+
+
+######################################################################
 # What follows is the generic builder.
 
 
@@ -400,9 +474,22 @@ patchW() {
         return
     fi
 
+    if test -z "$patchFlags"; then
+        patchFlags="-p1"
+    fi
+
     for i in $patches; do
         header "applying patch $i" 3
-        patch -p1 < $i || fail
+        local uncompress=cat
+        case $i in
+            *.gz)
+                uncompress=gunzip
+                ;;
+            *.bz2)
+                uncompress=bunzip2
+                ;;
+        esac
+        $uncompress < $i | patch $patchFlags || fail
         stopNest
     done
 }
@@ -483,8 +570,10 @@ buildW() {
 
     eval "$preBuild"
     
-    echo "make flags: $makeFlags ${makeFlagsArray[@]}"
-    make $makeFlags "${makeFlagsArray[@]}" || fail
+    echo "make flags: $makeFlags ${makeFlagsArray[@]} $buildFlags ${buildFlagsArray[@]}"
+    make \
+        $makeFlags "${makeFlagsArray[@]}" \
+        $buildFlags "${buildFlagsArray[@]}" || fail
 
     eval "$postBuild"
 }
@@ -512,8 +601,10 @@ checkW() {
         checkTarget="check"
     fi
 
-    echo "check flags: $checkFlags ${checkFlagsArray[@]}"
-    make $checkFlags "${checkFlagsArray[@]}" $checkTarget || fail
+    echo "check flags: $makeFlags ${makeFlagsArray[@]} $checkFlags ${checkFlagsArray[@]}"
+    make \
+        $makeFlags "${makeFlagsArray[@]}" \
+        $checkFlags "${checkFlagsArray[@]}" $checkTarget || fail
 }
 
 
@@ -549,12 +640,46 @@ installW() {
     eval "$preInstall"
 
     ensureDir "$prefix"
-    
-    if test -z "$dontMakeInstall"; then
-        echo "install flags: $installFlags ${installFlagsArray[@]}"
-        make install $installFlags "${installFlagsArray[@]}" || fail
+
+    if test -z "$installCommand"; then
+        if test -z "$installTargets"; then
+            installTargets=install
+        fi
+        echo "install flags: $installTargets $makeFlags ${makeFlagsArray[@]} $installFlags ${installFlagsArray[@]}"
+        make $installTargets \
+            $makeFlags "${makeFlagsArray[@]}" \
+            $installFlags "${installFlagsArray[@]}" || fail
+    else
+        eval "$installCommand"
     fi
 
+    eval "$postInstall"
+}
+
+
+installPhase() {
+    if test "$dontInstall" = 1; then
+        return
+    fi
+    header "installing"
+    startLog "install"
+    installW
+    stopLog
+    stopNest
+}
+
+
+# The fixup phase performs generic, package-independent, Nix-related
+# stuff, like running patchelf and setting the
+# propagated-build-inputs.  It should rarely be overriden.
+fixupW() {
+    if test -n "$fixupPhase"; then
+        eval "$fixupPhase"
+        return
+    fi
+
+    eval "$preFixup"
+
     if test -z "$dontStrip" -a "$NIX_STRIP_DEBUG" = 1; then
         find "$prefix" -name "*.a" -exec echo stripping {} \; \
             -exec strip -S {} \; || fail
@@ -569,17 +694,17 @@ installW() {
         echo "$propagatedBuildInputs" > "$out/nix-support/propagated-build-inputs"
     fi
 
-    eval "$postInstall"
+    eval "$postFixup"
 }
 
 
-installPhase() {
-    if test "$dontInstall" = 1; then
+fixupPhase() {
+    if test "$dontFixup" = 1; then
         return
     fi
-    header "installing"
-    startLog "install"
-    installW
+    header "post-installation fixup"
+    startLog "fixup"
+    fixupW
     stopLog
     stopNest
 }
@@ -631,12 +756,17 @@ distPhase() {
 genericBuild() {
     header "building $out"
 
+    if test -n "$buildCommand"; then
+        eval "$buildCommand"
+        return
+    fi
+
     unpackPhase
     cd $sourceRoot
 
     if test -z "$phases"; then
         phases="patchPhase configurePhase buildPhase checkPhase \
-            installPhase distPhase";
+            installPhase fixupPhase distPhase";
     fi
 
     for i in $phases; do
diff --git a/pkgs/stdenv/linux/default.nix b/pkgs/stdenv/linux/default.nix
index 1c9653bc87b..f926469a403 100644
--- a/pkgs/stdenv/linux/default.nix
+++ b/pkgs/stdenv/linux/default.nix
@@ -80,6 +80,7 @@ rec {
       name = "stdenv-linux-initial";
       builder = bootstrapTools.bash;
       args = [ ./scripts/builder-stdenv-initial.sh ];
+      stdenvScript = ../generic/setup.sh;
       inherit system staticTools curl;
     } // {
       # !!! too much duplication with stdenv/generic/default.nix
diff --git a/pkgs/stdenv/linux/scripts/builder-stdenv-initial.sh b/pkgs/stdenv/linux/scripts/builder-stdenv-initial.sh
index f753667d260..1780b45f87e 100644
--- a/pkgs/stdenv/linux/scripts/builder-stdenv-initial.sh
+++ b/pkgs/stdenv/linux/scripts/builder-stdenv-initial.sh
@@ -4,7 +4,4 @@ PATH=$staticTools/bin
 
 mkdir $out
 
-cat > $out/setup <<EOF
-PATH=$staticTools/bin
-EOF
-
+sed -e "s^@initialPath@^$staticTools^" -e "s^@preHook@^^" -e "s^@postHook@^^" < $stdenvScript > $out/setup
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 43ade0db676..89a728063ae 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -160,8 +160,6 @@ rec {
 
   stdenv = if bootStdenv == null then defaultStdenv else bootStdenv;
 
-  stdenvNew = overrideSetup stdenv ../stdenv/generic/setup-new2.sh;
-
 
   ### BUILD SUPPORT
 
@@ -195,7 +193,7 @@ rec {
   # Run the shell command `buildCommand' to produce a store object
   # named `name'.  The attributes in `env' are added to the
   # environment prior to running the command.
-  runCommand = name: env: buildCommand: stdenvNew.mkDerivation ({
+  runCommand = name: env: buildCommand: stdenv.mkDerivation ({
     inherit name buildCommand;
   } // env);
 
@@ -209,11 +207,8 @@ rec {
   cleanSource = src: builtins.filterSource
     (name: baseNameOf (toString name) != ".svn") src;
   
-  # !!! obsolete
-  substitute = ../build-support/substitute/substitute.sh;
-
   substituteAll = import ../build-support/substitute/substitute-all.nix {
-    stdenv = stdenvNew;
+    inherit stdenv;
   };
 
   nukeReferences = import ../build-support/nuke-references/default.nix {
@@ -1810,8 +1805,7 @@ rec {
   };
 
   wxHaskell = import ../development/libraries/haskell/wxHaskell {
-    inherit fetchurl unzip ghc;
-    stdenv = stdenvNew;
+    inherit stdenv fetchurl unzip ghc;
     wxGTK = import ../development/libraries/wxGTK-2.6 {
       inherit fetchurl stdenv pkgconfig;
       inherit (gtkLibs) gtk;
@@ -2006,8 +2000,7 @@ rec {
   };
 
   twisted = import ../development/python-modules/twisted {
-    inherit fetchurl python ZopeInterface;
-    stdenv = stdenvNew;
+    inherit fetchurl stdenv python ZopeInterface;
   };
 
   ZopeInterface = import ../development/python-modules/ZopeInterface {
@@ -2173,8 +2166,7 @@ rec {
   kernel = kernel_2_6_18;
 
   kernel_2_6_18 = import ../os-specific/linux/kernel/linux-2.6.18.nix {
-    inherit fetchurl perl mktemp module_init_tools;
-    stdenv = overrideSetup stdenv ../stdenv/generic/setup-new.sh;
+    inherit fetchurl stdenv perl mktemp module_init_tools;
     kernelPatches = [
       { name = "skas-2.6.18-v9-pre9";
         patch = fetchurl {
@@ -2212,8 +2204,7 @@ rec {
   };
 
   libcap = import ../os-specific/linux/libcap {
-    inherit fetchurl;
-    stdenv = overrideSetup stdenv ../stdenv/generic/setup-new2.sh;
+    inherit fetchurl stdenv;
   };
 
   lvm2 = import ../os-specific/linux/lvm2 {
@@ -2792,7 +2783,7 @@ rec {
   };
 
   xfig = import ../applications/graphics/xfig {
-    stdenv = overrideGCC (overrideSetup stdenv ../stdenv/generic/setup-new.sh) gcc34;
+    stdenv = overrideGCC stdenv gcc34;
     inherit fetchurl makeWrapper x11 Xaw3d libpng libjpeg;
     inherit (xlibs) imake libXpm libXmu libXi libXp;
   };
@@ -2997,7 +2988,7 @@ rec {
     };
 
     pysqlite = import ../development/libraries/pysqlite {
-      inherit stdenv fetchurl python substitute sqlite;
+      inherit stdenv fetchurl python sqlite;
     };
   };