From 6208059079571059cdf462942584efa88f37b52e Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 19 Jan 2012 15:39:12 +0000
Subject: [PATCH] * The postHook substitution is not used anywhere, so get rid
 of it.

svn path=/nixpkgs/branches/stdenv-updates/; revision=31702
---
 pkgs/misc/my-env/default.nix    | 2 --
 pkgs/stdenv/generic/builder.sh  | 1 -
 pkgs/stdenv/generic/default.nix | 4 ++--
 pkgs/stdenv/generic/setup.sh    | 5 +----
 4 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/pkgs/misc/my-env/default.nix b/pkgs/misc/my-env/default.nix
index 76080d8e114..4e63cca439b 100644
--- a/pkgs/misc/my-env/default.nix
+++ b/pkgs/misc/my-env/default.nix
@@ -48,8 +48,6 @@ mkDerivation {
   phases = [ "buildPhase" ];
   setupNew = substituteAll {
     src = ../../stdenv/generic/setup.sh;
-    preHook="";
-    postHook="";
     initialPath= (import ../../stdenv/common-path.nix) { inherit pkgs; };
     gcc = stdenv.gcc;
   };
diff --git a/pkgs/stdenv/generic/builder.sh b/pkgs/stdenv/generic/builder.sh
index 82620f96ef5..6895d104309 100644
--- a/pkgs/stdenv/generic/builder.sh
+++ b/pkgs/stdenv/generic/builder.sh
@@ -8,7 +8,6 @@ mkdir $out
 
 sed \
     -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" \
diff --git a/pkgs/stdenv/generic/default.nix b/pkgs/stdenv/generic/default.nix
index b3f6c16eb02..b0cee743f8c 100644
--- a/pkgs/stdenv/generic/default.nix
+++ b/pkgs/stdenv/generic/default.nix
@@ -1,4 +1,4 @@
-{ system, name, preHook ? null, postHook ? null, initialPath, gcc, shell
+{ system, name, preHook ? null, initialPath, gcc, shell
 , extraAttrs ? {}, overrides ? (pkgs: {})
 
 , # The `fetchurl' to use for downloading curl and its dependencies
@@ -24,7 +24,7 @@ let
 
         setup = setupScript;
 
-        inherit preHook postHook initialPath gcc shell;
+        inherit preHook initialPath gcc shell;
 
         propagatedUserEnvPkgs = [gcc] ++
           lib.filter lib.isDerivation initialPath;
diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh
index 5557e34cd0d..aa5f01a75c3 100644
--- a/pkgs/stdenv/generic/setup.sh
+++ b/pkgs/stdenv/generic/setup.sh
@@ -102,9 +102,7 @@ fi
 
 # Execute the pre-hook.
 export SHELL=@shell@
-if [ -z "$shell" ]; then
-    export shell=@shell@
-fi
+if [ -z "$shell" ]; then export shell=@shell@; fi
 if [ -n "@preHook@" ]; then source @preHook@; fi
 runHook preHook
 
@@ -844,7 +842,6 @@ genericBuild() {
 
 
 # Execute the post-hook.
-if test -n "@postHook@"; then source @postHook@; fi
 runHook postHook