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

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

Browse Source 
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/tools/networking/gvpe/default.nix
View File

@ -17,7 +17,11 @@ rec {
]; ];
/* doConfigure should be removed if not needed */ /* 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 = { meta = {
description = "A proteted multinode virtual network"; description = "A proteted multinode virtual network";

2
pkgs/top-level/all-packages.nix
View File

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