Fix /sbin/ reference. On Linux just replace it with an "ip link" reference

svn path=/nixpkgs/trunk/; revision=16918
This commit is contained in:
Michael Raskin 2009-09-01 22:42:05 +00:00
parent 58e6161768
commit 3d7152db82
2 changed files with 6 additions and 2 deletions

View File

@ -17,7 +17,11 @@ rec {
];
/* doConfigure should be removed if not needed */
phaseNames = ["doConfigure" "doMakeInstall"];
phaseNames = ["doConfigure" "preBuild" "doMakeInstall"];
preBuild = a.fullDepEntry (''
sed -e 's@"/sbin/ifconfig.*"@"${a.iproute}/sbin/ip link set $IFNAME address $MAC mtu $MTU"@' -i src/device-linux.C
sed -e 's@/sbin/ifconfig@${a.nettools}/sbin/ifconfig@g' -i src/device-*.C
'') ["minInit" "doUnpack"];
meta = {
description = "A proteted multinode virtual network";

View File

@ -850,7 +850,7 @@ let
};
gvpe = builderDefsPackage ../tools/networking/gvpe {
inherit openssl gmp;
inherit openssl gmp nettools iproute;
};
gzip = useFromStdenv "gzip"