From ee45e160b1fc2a8d32233bd7647e5e5fb72a486a Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 19 Jan 2012 15:56:17 +0000 Subject: * Prepend the "prehook" rather than sourcing it. * Don't call xargs with the -r flag in the Darwin bootstrap. svn path=/nixpkgs/branches/stdenv-updates/; revision=31703 --- pkgs/stdenv/generic/builder.sh | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'pkgs/stdenv/generic/builder.sh') diff --git a/pkgs/stdenv/generic/builder.sh b/pkgs/stdenv/generic/builder.sh index 6895d104309a..98b90144611a 100644 --- a/pkgs/stdenv/generic/builder.sh +++ b/pkgs/stdenv/generic/builder.sh @@ -6,12 +6,13 @@ done mkdir $out -sed \ - -e "s^@preHook@^$preHook^g" \ +echo "$preHook" > $out/setup +cat "$setup" >> $out/setup + +sed -i "$out/setup" \ -e "s^@initialPath@^$initialPath^g" \ -e "s^@gcc@^$gcc^g" \ - -e "s^@shell@^$shell^g" \ - < "$setup" > "$out/setup" + -e "s^@shell@^$shell^g" # Allow the user to install stdenv using nix-env and get the packages # in stdenv. -- cgit 1.4.1