From 6b8e8bfedb3fee8ab413b5fbb94b57a08cdd30ca Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 19 Jan 2012 16:23:14 +0000 Subject: [PATCH] * "sed -i" isn't very portable, so don't use it here. svn path=/nixpkgs/branches/stdenv-updates/; revision=31705 --- pkgs/stdenv/generic/builder.sh | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/stdenv/generic/builder.sh b/pkgs/stdenv/generic/builder.sh index 98b90144611a..fd4c17ca2519 100644 --- a/pkgs/stdenv/generic/builder.sh +++ b/pkgs/stdenv/generic/builder.sh @@ -9,10 +9,11 @@ mkdir $out echo "$preHook" > $out/setup cat "$setup" >> $out/setup -sed -i "$out/setup" \ - -e "s^@initialPath@^$initialPath^g" \ +sed -e "s^@initialPath@^$initialPath^g" \ -e "s^@gcc@^$gcc^g" \ - -e "s^@shell@^$shell^g" + -e "s^@shell@^$shell^g" \ + < $out/setup > $out/setup.tmp +mv $out/setup.tmp $out/setup # Allow the user to install stdenv using nix-env and get the packages # in stdenv.