alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

Merge pull request #30759 from FlorentBecker/pptp_route

Browse source 
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
parent ad1bf41391 30c739f7a1
commit 1f966e93f6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
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/tools/networking/pptp/default.nix
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 ];