mingw related stuff

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

3 files changed, 464 insertions, 330 deletions

diff --git a/pkgs/stdenv/mingw/default.nix b/pkgs/stdenv/mingw/default.nix
index adbae261537..bedf3986d17 100644
--- a/pkgs/stdenv/mingw/default.nix
+++ b/pkgs/stdenv/mingw/default.nix
@@ -38,6 +38,7 @@ let {
       shell = msysShell;
       path = [
         (make + "/bin")
+        (tar + "/bin")
         (binutils + "/bin")
         (gccFull + "/bin")
         (mingwRuntimeBin + "/bin")
@@ -77,7 +78,7 @@ let {
            * binutils is on the path because it contains dlltool, which
            * is invoked on the PATH by some packages.
            */
-          initialPath = [make binutils gccFull mingwRuntimeSrc w32apiSrc msys];
+          initialPath = [make tar binutils gccFull mingwRuntimeSrc w32apiSrc msys];
           gcc = gccFull;
           shell = msysShell;
           inherit curl;
@@ -152,7 +153,7 @@ let {
       src =
         fetchurlInit1 {
           url = ftp://ftp.strategoxt.org/pub/mingw/msys-1.0.11.tar.gz;
-          md5 = "85ce547934797019d2d642ec3b53934b";
+          sha256 = "08qp4jk279i66q6ngksg58fx3cfv1r6p5n394h2kfrs56qs9zvz4";
         };
     };
 
@@ -179,6 +180,12 @@ let {
      inherit fetchurl;
    };
 
+  tar =
+   (import ./pkgs).tar {
+     stdenv = stdenvInit2;
+     inherit fetchurl;
+   };
+
   binutils =
    (import ./pkgs).binutils {
      stdenv = stdenvInit2;
diff --git a/pkgs/stdenv/mingw/pkgs/default.nix b/pkgs/stdenv/mingw/pkgs/default.nix
index 4110e250b0e..52b68d9de24 100755
--- a/pkgs/stdenv/mingw/pkgs/default.nix
+++ b/pkgs/stdenv/mingw/pkgs/default.nix
@@ -29,6 +29,20 @@ rec {
     };
 
   /**
+   * Tar
+   */
+  tar = {stdenv, fetchurl} :
+    stdenv.mkDerivation {
+      name = "mingw-tar";
+      builder = ./bin-builder.sh;
+      src = 
+        fetchurl {
+          url = ftp://ftp.strategoxt.org/pub/mingw/tar-1.22-1-msys-1.0.11-bin.tar.gz;
+          sha256 = "17rbv159g56q3bp8rh5vzv8hw8clxs7vk731cgqg0vy1fzls6yfq";
+        };
+    };
+
+  /**
    * GCC. Binary
    */
   gccFull =  {stdenv, fetchurl} :
@@ -111,13 +125,13 @@ rec {
    */
   pkgconfigBin =  {stdenv, fetchurl} :
     stdenv.mkDerivation {
-      name = "pkgconfig-0.20";
+      name = "pkgconfig-0.23";
       builder = ./pkgconfig-builder.sh;
       setupHook = ../../../development/tools/misc/pkgconfig/setup-hook.sh;
       src =
         fetchurl {
-          url = http://www.cs.uu.nl/people/martin/pkg-config-0.20-bin.tar.gz;
-          md5 = "71f9595a022619b8e8b0f7853790c4c7";
+          url = ftp://ftp.strategoxt.org/pub/mingw/pkg-config-0.23-bin.tar.gz;
+          sha256 = "1z4zyg20g25qvx102mm2nzsxyh8fcsbz2lgi7qp32b5vrixi1037";
         };
     };
 
diff --git a/pkgs/stdenv/mingw/setup.sh b/pkgs/stdenv/mingw/setup.sh
index 11705f8310f..232a3191945 100755
--- a/pkgs/stdenv/mingw/setup.sh
+++ b/pkgs/stdenv/mingw/setup.sh
@@ -1,11 +1,97 @@
+# Run the named hook, either by calling the function with that name or
+# by evaluating the variable with that name.  This allows convenient
+# setting of hooks both from Nix expressions (as attributes /
+# environment variables) and from shell scripts (as functions). 
+runHook() {
+    local hookName="$1"
+    if test "$(type -t $hookName)" = function; then
+        $hookName
+    else
+        eval "${!hookName}"
+    fi
+}
+
+
+exitHandler() {
+    exitCode=$?
+    set +e
+
+    closeNest
+
+    if test -n "$showBuildStats"; then
+        times > "$NIX_BUILD_TOP/.times"
+        local -a times=($(cat "$NIX_BUILD_TOP/.times"))
+        # Print the following statistics:
+        # - user time for the shell
+        # - system time for the shell
+        # - user time for all child processes
+        # - system time for all child processes
+        echo "build time elapsed: " ${times[*]}
+    fi
+    
+    if test $exitCode != 0; then
+        runHook failureHook
+    
+        # If the builder had a non-zero exit code and
+        # $succeedOnFailure is set, create the file
+        # `$out/nix-support/failed' to signal failure, and exit
+        # normally.  Otherwise, return the original exit code.
+        if test -n "$succeedOnFailure"; then
+            echo "build failed with exit code $exitCode (ignored)"
+            ensureDir "$out/nix-support"
+            echo -n $exitCode > "$out/nix-support/failed"
+            exit 0
+        fi
+        
+    else
+        runHook exitHook
+    fi
+    
+    exit $exitCode
+}
+
+trap "exitHandler" EXIT
+
+
+######################################################################
+# Helper functions that might be useful in setup hooks.
+
+
+addToSearchPathWithCustomDelimiter() {
+    local delimiter=$1
+    local varName=$2
+    local dir=$3
+    if [ -d "$dir" ]; then
+        eval export ${varName}=${!varName}${!varName:+$delimiter}${dir}
+    fi
+}
+
+PATH_DELIMITER=':'
+
+addToSearchPath() {
+    addToSearchPathWithCustomDelimiter "${PATH_DELIMITER}" "$@"
+}
+
+
+######################################################################
+# Initialisation.
+
 set -e
 
 test -z $NIX_GCC && NIX_GCC=@GCC@
 
+
+# Wildcard expansions that don't match should expand to an empty list.
+# This ensures that, for instance, "for i in *; do ...; done" does the
+# right thing.
+shopt -s nullglob
+
+
 # Set up the initial path.
 PATH=
 for i in $NIX_GCC @INITIALPATH@; do
-    PATH=$PATH${PATH:+:}$i/bin
+    if test "$i" = /; then i=; fi
+    addToSearchPath PATH $i/bin
 done
 
 # Hack: the /tmp of Cygwin is different from the /tmp in MSYS
@@ -17,12 +103,15 @@ else
 fi
 
 if test "$NIX_DEBUG" = "1"; then
-    echo "Initial path: $PATH"
-    echo "$buildInputs"
+    echo "initial path: $PATH"
 fi
 
+
 # Execute the pre-hook.
 export SHELL=@SHELL@
+if test -z "$shell"; then
+    export shell=@SHELL@
+fi
 
 # Check that the pre-hook initialised SHELL.
 if test -z "$SHELL"; then echo "SHELL not set"; exit 1; fi
@@ -34,40 +123,29 @@ if test -f $NIX_GCC/nix-support/setup-hook; then
     source $NIX_GCC/nix-support/setup-hook
 fi
 
-    
-# Ensure that the given directory exists.
+
+# Ensure that the given directories exists.
 ensureDir() {
-    local dir=$1
-    if ! test -x "$dir"; then mkdir -p "$dir"; fi
+    local dir
+    for dir in "$@"; do
+        if ! test -x "$dir"; then mkdir -p "$dir"; fi
+    done
 }
 
-
-# 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
+installBin() {
+    ensureDir $out/bin
+    cp "$@" $out/bin
 }
 
 
 # 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).
-if test -n "$addInputsHook"; then
-    $addInputsHook
-fi
+runHook addInputsHook
 
 
 # Recursively find all build inputs.
-findInputs()
-{
+findInputs() {
     local pkg=$1
 
     case $pkgs in
@@ -75,13 +153,13 @@ findInputs()
             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
@@ -90,9 +168,6 @@ findInputs()
 }
 
 pkgs=""
-if test -n "$buildinputs"; then
-    buildInputs="$buildinputs" # compatibility
-fi
 for i in $buildInputs $propagatedBuildInputs; do
     findInputs $i
 done
@@ -100,19 +175,14 @@ done
 
 # Set the relevant environment variables to point to the build inputs
 # found above.
-addToEnv()
-{
+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
+        addToSearchPath _PATH $1/bin
     fi
 
+    # Run the package-specific hooks set by the setup-hook scripts.
     for i in "${envHooks[@]}"; do
         $i $pkg
     done
@@ -126,6 +196,9 @@ done
 # Add the output as an rpath.
 if test "$NIX_NO_SELF_RPATH" != "1"; then
     export NIX_LDFLAGS="-rpath $out/lib $NIX_LDFLAGS"
+    if test -n "$NIX_LIB64_IN_SELF_RPATH"; then
+        export NIX_LDFLAGS="-rpath $out/lib64 $NIX_LDFLAGS"
+    fi
 fi
 
 
@@ -136,33 +209,131 @@ if test -z "$NIX_STRIP_DEBUG"; then
 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
+# 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
 
 
-# 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
+# Set the prefix.  This is generally $out, but it can be overriden,
+# for instance if we just want to perform a test build/install to a
+# temporary location and write a build report to $out.
+if test -z "$prefix"; then
+    prefix="$out";
 fi
 
+if test "$useTempPrefix" = "1"; then
+    prefix="$NIX_BUILD_TOP/tmp_prefix";
+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
 
 PATH=$_PATH${_PATH:+:}$PATH
 if test "$NIX_DEBUG" = "1"; then
-    echo "Final path: $PATH"
+    echo "final path: $PATH"
 fi
 
 
+# Make GNU Make produce nested output.
+export NIX_INDENT_MAKE=1
+
+
+######################################################################
+# Misc. helper functions.
+
+
+stripDirs() {
+    local dirs="$1"
+    local stripFlags="$2"
+    local dirsNew=
+
+    for d in ${dirs}; do
+        if test -d "$prefix/$d"; then
+            dirsNew="${dirsNew} $prefix/$d "
+        fi
+    done
+    dirs=${dirsNew}
+
+    if test -n "${dirs}"; then
+        header "stripping (with flags $stripFlags) in $dirs"
+        find $dirs -type f -print0 | xargs -0 ${xargsFlags:--r} strip $stripFlags || true
+        stopNest
+    fi
+}
+
+
+######################################################################
+# Textual substitution functions.
+
+
+substitute() {
+    local input="$1"
+    local output="$2"
+
+    local -a params=("$@")
+    local -a args=()
+
+    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))
+        fi
+
+        if test "$p" = "--subst-var"; then
+            varName="${params[$((n + 1))]}"
+            pattern="@$varName@"
+            replacement="${!varName}"
+            n=$((n + 1))
+        fi
+
+        if test "$p" = "--subst-var-by"; then
+            pattern="@${params[$((n + 1))]}@"
+            replacement="${params[$((n + 2))]}"
+            n=$((n + 2))
+        fi
+
+        if test ${#args[@]} != 0; then
+            args[${#args[@]}]="-a"
+        fi
+        args[${#args[@]}]="$pattern"
+        args[${#args[@]}]="$replacement"
+    done
+
+    replace-literal -e -s -- "${args[@]}" < "$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.
 
@@ -192,69 +363,16 @@ closeNest() {
     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() {
+dumpVars() {  
+    echo  "Dumping env-vars to $NIX_BUILD_TOP/env-vars"
     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
+        export > "$NIX_BUILD_TOP/env-vars"
     fi
 }
 
@@ -270,43 +388,45 @@ stripHash() {
 
 
 unpackFile() {
-    local file=$1
+    curSrc="$1"
     local cmd
 
-    case $file in
-        *.tar) cmd="tar xvf $file";;
-        *.tar.gz | *.tgz | *.tar.Z) cmd="tar xvfz $file";;
-        *.tar.bz2 | *.tbz2) cmd="tar xvfj $file";;
-        *.zip) cmd="unzip $file";;
+    header "unpacking source archive $curSrc" 3
+
+    case "$curSrc" in
+        *.tar)
+            tar xvf $curSrc
+            ;;
+        *.tar.gz | *.tgz | *.tar.Z)
+            gzip -d < $curSrc | tar xvf -
+            ;;
+        *.tar.bz2 | *.tbz2)
+            bzip2 -d < $curSrc | tar xvf -
+            ;;
+        *.zip)
+            unzip $curSrc
+            ;;
         *)
-            if test -d "$file"; then
-                stripHash $file
-                cmd="cp -prvd $file $strippedName"
+            if test -d "$curSrc"; then
+                stripHash $curSrc
+                cp -prvd $curSrc $strippedName
             else
-                if test -n "$findUnpacker"; then
-                    $findUnpacker $1;
-                fi
                 if test -z "$unpackCmd"; then
-                    echo "source archive $file has unknown type"
+                    echo "source archive $curSrc has unknown type"
                     exit 1
                 fi
-                cmd=$unpackCmd
+                runHook unpackCmd
             fi
             ;;
     esac
 
-    header "unpacking source archive $file (using $cmd)" 3
-    $cmd || fail
     stopNest
 }
 
 
-unpackW() {
-    if test -n "$unpackPhase"; then
-        $unpackPhase
-        return
-    fi
-
+unpackPhase() {
+    runHook preUnpack
+    
     if test -z "$srcs"; then
         if test -z "$src"; then
             echo 'variable $src or $srcs should point to the source'
@@ -333,8 +453,8 @@ unpackW() {
 
     # Find the source directory.
     if test -n "$setSourceRoot"; then
-        $setSourceRoot
-    else
+        runHook setSourceRoot
+    elif test -z "$sourceRoot"; then
         sourceRoot=
         for i in *; do
             if test -d "$i"; then
@@ -346,7 +466,7 @@ unpackW() {
                             echo "unpacker produced multiple directories"
                             exit 1
                         fi
-                        sourceRoot=$i
+                        sourceRoot="$i"
                         ;;
                 esac
             fi
@@ -363,72 +483,40 @@ unpackW() {
     # 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
-    
-    if test -n "$postUnpack"; then
-        $postUnpack
+    if test "$dontMakeSourcesWritable" != 1; then
+        chmod -R u+w "$sourceRoot"
     fi
-}
-
 
-unpackPhase() {
-    header "unpacking sources"
-    startLog "unpack"
-    unpackW
-    stopLog
-    stopNest
+    runHook postUnpack
 }
 
 
-patchW() {
-    if test -n "$patchPhase"; then
-        $patchPhase
-        return
-    fi
-
+patchPhase() {
+    runHook prePatch
+    
+    if test -z "$patchPhase" -a -z "$patches"; then return; fi
+    
     for i in $patches; do
         header "applying patch $i" 3
-        patch -p1 < $i || fail
+        local uncompress=cat
+        case $i in
+            *.gz)
+                uncompress="gzip -d"
+                ;;
+            *.bz2)
+                uncompress="bzip2 -d"
+                ;;
+        esac
+        $uncompress < $i | patch ${patchFlags:--p1}
         stopNest
     done
-}
 
-
-patchPhase() {
-    if test -z "$patchPhase" -a -z "$patches"; then return; fi
-    header "patching sources"
-    startLog "patch"
-    patchW
-    stopLog
-    stopNest
+    runHook postPatch
 }
 
 
-fixLibtool() {
-    sed 's^eval sys_lib_.*search_path=.*^^' < $1 > $1.tmp
-    mv $1.tmp $1
-}
-
-
-configureW() {
-    if test -n "$configurePhase"; then
-        $configurePhase
-        return
-    fi
-
-    if test -n "$preConfigure"; then
-        $preConfigure
-    fi
-
-    if test -z "$prefix"; then
-        prefix="$out";
-    fi
-
-    if test "$useTempPrefix" = "1"; then
-        prefix="$NIX_BUILD_TOP/tmp_prefix";
-    fi
+configurePhase() {
+    runHook preConfigure
 
     if test -z "$configureScript"; then
         configureScript=./configure
@@ -438,218 +526,243 @@ configureW() {
         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"
+        configureFlags="${prefixKey:---prefix=}$prefix $configureFlags"
     fi
 
-    echo "configure flags: $configureFlags"
-    $configureScript $configureFlags || fail
-
-    if test -n "$postConfigure"; then
-        $postConfigure
+    # Add --disable-dependency-tracking to speed up some builds.
+    if test -z "$dontAddDisableDepTrack"; then
+        if grep -q dependency-tracking $configureScript; then
+            configureFlags="--disable-dependency-tracking $configureFlags"
+        fi
     fi
-}
 
-
-configurePhase() {
-    header "configuring"
-    startLog "configure"
-    configureW
-    stopLog
-    stopNest
-}
-
-
-buildW() {
-    if test -n "$buildPhase"; then
-        $buildPhase
-        return
+    # By default, disable static builds.
+    if test -z "$dontDisableStatic"; then
+        if grep -q enable-static $configureScript; then
+            configureFlags="--disable-static $configureFlags"
+        fi
     fi
 
-    if test -n "$preBuild"; then
-        $preBuild
-    fi
-    
-    echo "make flags: $makeFlags"
-    make $makeFlags || fail
+    echo "configure flags: $configureFlags ${configureFlagsArray[@]}"
+    $configureScript $configureFlags "${configureFlagsArray[@]}"
 
-    if test -n "$postBuild"; then
-        $postBuild
-    fi
+    runHook postConfigure
 }
 
 
 buildPhase() {
-    if test "$dontBuild" = 1; then
-        return
-    fi
-    header "building"
-    startLog "build"
-    buildW
-    stopLog
-    stopNest
-}
-
+    runHook preBuild
 
-checkW() {
-    if test -n "$checkPhase"; then
-        $checkPhase
+    if test -z "$makeFlags" && ! test -n "$makefile" -o -e "Makefile" -o -e "makefile" -o -e "GNUmakefile"; then
+        echo "no Makefile, doing nothing"
         return
     fi
 
-    if test -z "$checkTarget"; then
-        checkTarget="check"
-    fi
+    echo "make flags: $makeFlags ${makeFlagsArray[@]} $buildFlags ${buildFlagsArray[@]}"
+    make ${makefile:+-f $makefile} \
+        $makeFlags "${makeFlagsArray[@]}" \
+        $buildFlags "${buildFlagsArray[@]}"
 
-    echo "check flags: $checkFlags"
-    make $checkFlags $checkTarget || fail
+    runHook postBuild
 }
 
 
 checkPhase() {
-    if test "$doCheck" != 1; then
-        return
-    fi
-    header "checking"
-    startLog "check"
-    checkW
-    stopLog
-    stopNest
+    runHook preCheck
+
+    echo "check flags: $makeFlags ${makeFlagsArray[@]} $checkFlags ${checkFlagsArray[@]}"
+    make ${makefile:+-f $makefile} \
+        $makeFlags "${makeFlagsArray[@]}" \
+        $checkFlags "${checkFlagsArray[@]}" ${checkTarget:-check}
+
+    runHook postCheck
 }
 
 
 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 {} \;
+    if test -e "$prefix"; then
+        find "$prefix" \( \
+            \( -type f -a -name "*.so*" \) -o \
+            \( -type f -a -perm +0100 \) \
+            \) -print -exec patchelf --shrink-rpath {} \;
+    fi
     stopNest
 }
 
 
-installW() {
-    if test -n "$installPhase"; then
-        $installPhase
-        return
-    fi
-    
-    if test -n "$preInstall"; then
-        $preInstall
-    fi
+patchShebangs() {
+    # Rewrite all script interpreter file names (`#! /path') under the
+    # specified  directory tree to paths found in $PATH.  E.g.,
+    # /bin/sh will be rewritten to /nix/store/<hash>-some-bash/bin/sh.
+    # Interpreters that are already in the store are left untouched.
+    header "patching script interpreter paths"
+    local dir="$1"
+    local f
+    for f in $(find "$dir" -type f -perm +0100); do
+        local oldPath=$(sed -ne '1 s,^#![ ]*\([^ ]*\).*$,\1,p' "$f")
+        if test -n "$oldPath" -a "${oldPath:0:${#NIX_STORE}}" != "$NIX_STORE"; then
+            local newPath=$(type -P $(basename $oldPath) || true)
+            if test -n "$newPath" -a "$newPath" != "$oldPath"; then
+                echo "$f: interpreter changed from $oldPath to $newPath"
+                sed -i -e "1 s,$oldPath,$newPath," "$f"
+            fi
+        fi
+    done
+    stopNest
+}
+
+
+installPhase() {
+    runHook preInstall
 
     ensureDir "$prefix"
-    
-    if test -z "$dontMakeInstall"; then
-        echo "install flags: $installFlags"
-        make install $installFlags || fail
+
+    installTargets=${installTargets:-install}
+    echo "install flags: $installTargets $makeFlags ${makeFlagsArray[@]} $installFlags ${installFlagsArray[@]}"
+    make ${makefile:+-f $makefile} $installTargets \
+        $makeFlags "${makeFlagsArray[@]}" \
+        $installFlags "${installFlagsArray[@]}"
+
+    runHook postInstall
+}
+
+
+# The fixup phase performs generic, package-independent, Nix-related
+# stuff, like running patchelf and setting the
+# propagated-build-inputs.  It should rarely be overriden.
+fixupPhase() {
+    runHook preFixup
+
+    # Put man/doc/info under $out/share.
+    forceShare=${forceShare:=man doc info}
+    if test -n "$forceShare"; then
+        for d in $forceShare; do
+            if test -d "$prefix/$d"; then
+                if test -d "$prefix/share/$d"; then
+                    echo "both $d/ and share/$d/ exists!"
+                else
+                    echo "fixing location of $d/ subdirectory"
+                    ensureDir $prefix/share
+                    if test -w $prefix/share; then
+                        mv -v $prefix/$d $prefix/share
+                        ln -sv share/$d $prefix
+                    fi
+                fi
+            fi
+        done;
     fi
 
-    if test -z "$dontStrip" -a "$NIX_STRIP_DEBUG" = 1; then
-        find "$prefix" -name "*.a" -exec echo stripping {} \; \
-            -exec strip -S {} \; || fail
+    # TODO: strip _only_ ELF executables, and return || fail here...
+    if test -z "$dontStrip"; then
+        stripDebugList=${stripDebugList:-lib lib64 libexec bin sbin}
+        if test -n "$stripDebugList"; then
+            stripDirs "$stripDebugList" "${stripDebugFlags:--S}"
+        fi
+        
+        stripAllList=${stripAllList:-}
+        if test -n "$stripAllList"; then
+            stripDirs "$stripAllList" "${stripAllFlags:--s}"
+        fi
     fi
 
     if test "$havePatchELF" = 1 -a -z "$dontPatchELF"; then
         patchELF "$prefix"
     fi
 
+    if test -z "$dontPatchShebangs"; then
+        patchShebangs "$prefix"
+    fi
+
     if test -n "$propagatedBuildInputs"; then
         ensureDir "$out/nix-support"
         echo "$propagatedBuildInputs" > "$out/nix-support/propagated-build-inputs"
     fi
 
-    if test -n "$postInstall"; then
-        $postInstall
+    if test -n "$setupHook"; then
+        ensureDir "$out/nix-support"
+        substituteAll "$setupHook" "$out/nix-support/setup-hook"
     fi
-}
 
-
-installPhase() {
-    if test "$dontInstall" = 1; then
-        return
-    fi
-    header "installing"
-    startLog "install"
-    installW
-    stopLog
-    stopNest
+    runHook postFixup
 }
 
 
-distW() {
-    if test -n "$distPhase"; then
-        $distPhase
-        return
-    fi
-
-    if test -n "$preDist"; then
-        $preDist
-    fi
-    
-    if test -z "$distTarget"; then
-        distTarget="dist"
-    fi
+distPhase() {
+    runHook preDist
 
-    echo "dist flags: $distFlags"
-    make $distFlags $distTarget || fail
+    echo "dist flags: $distFlags ${distFlagsArray[@]}"
+    make ${makefile:+-f $makefile} $distFlags "${distFlagsArray[@]}" ${distTarget:-dist}
 
     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
+        cp -pvd ${tarballs:-*.tar.gz} $out/tarballs
     fi
 
-    if test -n "$postDist"; then
-        $postDist
-    fi
+    runHook postDist
 }
 
 
-distPhase() {
-    if test "$doDist" != 1; then
-        return
-    fi
-    header "creating distribution"
-    startLog "dist"
-    distW
-    stopLog
-    stopNest
+showPhaseHeader() {
+    local phase="$1"
+    case $phase in
+        unpackPhase) header "unpacking sources";;
+        patchPhase) header "patching sources";;
+        configurePhase) header "configuring";;
+        buildPhase) header "building";;
+        checkPhase) header "running tests";;
+        installPhase) header "installing";;
+        fixupPhase) header "post-installation fixup";;
+        *) header "$phase";;
+    esac
 }
 
 
 genericBuild() {
     header "building $out"
 
-    unpackPhase
-    cd $sourceRoot
-
-    if test -z "$phases"; then
-        phases="patchPhase configurePhase buildPhase checkPhase \
-            installPhase distPhase";
+    if test -n "$buildCommand"; then
+        eval "$buildCommand"
+        return
     fi
 
-    for i in $phases; do
+    if test -z "$phases"; then
+        phases="$prePhases unpackPhase patchPhase $preConfigurePhases \
+            configurePhase $preBuildPhases buildPhase checkPhase \
+            $preInstallPhases installPhase fixupPhase \
+            $preDistPhases distPhase $postPhases";
+    fi
+
+    for curPhase in $phases; do
+        if test "$curPhase" = buildPhase -a -n "$dontBuild"; then continue; fi
+        if test "$curPhase" = checkPhase -a -z "$doCheck"; then continue; fi
+        if test "$curPhase" = installPhase -a -n "$dontInstall"; then continue; fi
+        if test "$curPhase" = fixupPhase -a -n "$dontFixup"; then continue; fi
+        if test "$curPhase" = distPhase -a -z "$doDist"; then continue; fi
+        
+        showPhaseHeader "$curPhase"
         dumpVars
-        $i
+        
+        # Evaluate the variable named $curPhase if it exists, otherwise the
+        # function named $curPhase.
+        eval "${!curPhase:-$curPhase}"
+
+        if test "$curPhase" = unpackPhase; then
+            cd "${sourceRoot:-.}"
+        fi
+        
+        stopNest
     done
-    
+
     stopNest
 }
 
 
+
+
 dumpVars