Ported fixes for lsof and gw6c from stdenv-updates

svn path=/nixpkgs/branches/stdenv-updates-merge/; revision=10825
This commit is contained in:
Michael Raskin 2008-02-22 06:16:53 +00:00
parent 8ea6496a10
commit 6c20576972
2 changed files with 2 additions and 2 deletions

View File

@ -8,7 +8,7 @@ stdenv.mkDerivation {
sha256 = "0azvl43niqkq94drx52p6dvp70r38f25fqw181ywmvqn80dbb3c9";
};
unpackPhase = "tar xvjf $src; cd lsof_*; tar xvf lsof_*.tar; sourceRoot=lsof_*; ";
unpackPhase = "tar xvjf $src; cd lsof_*; tar xvf lsof_*.tar; sourceRoot=$( echo lsof_*/); ";
preBuild = "sed -i Makefile -e 's/^CFGF=/& -DHASIPv6=1/;';";
configurePhase = "./Configure -n linux;";
installPhase = " mkdir -p $out/bin $out/man/man8; cp lsof.8 $out/man/man8/; cp lsof $out/bin";

View File

@ -8,7 +8,7 @@ stdenv.mkDerivation {
sha256 = "1578i6j3kq7g5f55gy1nksl4q0lxssdk39ilrgqjc20gb6k5j7j3";
};
setSourceRoot = "sourceRoot=tspc*";
setSourceRoot = "sourceRoot=$(echo tspc*/)";
preBuild = "sed -e 's@/dev/net/tun@/dev/tun@' -i platform/linux/tsp_tun.c;
sed -e 's@/sbin/@/var/run/current-system/sw/sbin/@' -i template/linux.sh";