Merge pull request #30759 from FlorentBecker/pptp_route

pptp: correct reference to ${iproute}/bin/ip
This commit is contained in:
Joachim F 2017-10-28 11:31:57 +00:00 committed by GitHub
commit 1f966e93f6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -12,12 +12,12 @@ stdenv.mkDerivation rec {
patchPhase =
''
sed -e 's/install -o root/install/' -i Makefile
sed -e 's,/bin/ip,${iproute}/sbin/ip,' -i routing.c
'';
preConfigure =
''
makeFlagsArray=( PPPD=${ppp}/sbin/pppd BINDIR=$out/sbin \
MANDIR=$out/share/man/man8 PPPDIR=$out/etc/ppp )
makeFlagsArray=( IP=${iproute}/bin/ip PPPD=${ppp}/sbin/pppd \
BINDIR=$out/sbin MANDIR=$out/share/man/man8 \
PPPDIR=$out/etc/ppp )
'';
nativeBuildInputs = [ perl which ];