public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Darwin compatibility.

Browse Source 
svn path=/nixpkgs/branches/stdenv-updates/; revision=12038
This commit is contained in:
Eelco Dolstra 2008-06-11 14:08:01 +00:00
parent 1000662377
commit 8f9baa2e5a
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/stdenv/generic/setup.sh
View File

@ -74,6 +74,7 @@ test -z $NIX_GCC && NIX_GCC=@gcc@
# Set up the initial path. # Set up the initial path.
PATH= PATH=
for i in $NIX_GCC @initialPath@; do for i in $NIX_GCC @initialPath@; do
if test "$i" = /; then i=; fi
PATH=$PATH${PATH:+:}$i/bin PATH=$PATH${PATH:+:}$i/bin
done done
@ -586,8 +587,7 @@ patchPhase() {
fixLibtool() { fixLibtool() {
sed 's^eval sys_lib_.*search_path=.*^^' < $1 > $1.tmp sed -i -e 's^eval sys_lib_.*search_path=.*^^' "$1"
mv $1.tmp $1
} }
@ -702,7 +702,7 @@ patchShebangs() {
local newPath=$(type -P $(basename $oldPath) || true) local newPath=$(type -P $(basename $oldPath) || true)
if test -n "$newPath" -a "$newPath" != "$oldPath"; then if test -n "$newPath" -a "$newPath" != "$oldPath"; then
echo "$f: interpreter changed from $oldPath to $newPath" echo "$f: interpreter changed from $oldPath to $newPath"
sed -i "1 s,$oldPath,$newPath," "$f" sed -i -e "1 s,$oldPath,$newPath," "$f"
fi fi
fi fi
done done