diff options
author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2012-01-19 16:23:14 +0000 |
---|---|---|
committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2012-01-19 16:23:14 +0000 |
commit | 6b8e8bfedb3fee8ab413b5fbb94b57a08cdd30ca (patch) | |
tree | c0be38bd6b24b6897464ac4dd8a199204d9bdf14 /pkgs | |
parent | 698c4d296b569ab535dcbe7374c1d371507d1cc3 (diff) | |
download | nixlib-6b8e8bfedb3fee8ab413b5fbb94b57a08cdd30ca.tar nixlib-6b8e8bfedb3fee8ab413b5fbb94b57a08cdd30ca.tar.gz nixlib-6b8e8bfedb3fee8ab413b5fbb94b57a08cdd30ca.tar.bz2 nixlib-6b8e8bfedb3fee8ab413b5fbb94b57a08cdd30ca.tar.lz nixlib-6b8e8bfedb3fee8ab413b5fbb94b57a08cdd30ca.tar.xz nixlib-6b8e8bfedb3fee8ab413b5fbb94b57a08cdd30ca.tar.zst nixlib-6b8e8bfedb3fee8ab413b5fbb94b57a08cdd30ca.zip |
* "sed -i" isn't very portable, so don't use it here.
svn path=/nixpkgs/branches/stdenv-updates/; revision=31705
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/stdenv/generic/builder.sh | 7 |
1 files 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. |