public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki 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
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/tools/networking/pptp/default.nix
+3 -3
View File
@@ -12,12 +12,12 @@ stdenv.mkDerivation rec {
patchPhase = patchPhase =
'' ''
sed -e 's/install -o root/install/' -i Makefile sed -e 's/install -o root/install/' -i Makefile
sed -e 's,/bin/ip,${iproute}/sbin/ip,' -i routing.c
''; '';
preConfigure = preConfigure =
'' ''
makeFlagsArray=( PPPD=${ppp}/sbin/pppd BINDIR=$out/sbin \ makeFlagsArray=( IP=${iproute}/bin/ip PPPD=${ppp}/sbin/pppd \
MANDIR=$out/share/man/man8 PPPDIR=$out/etc/ppp ) BINDIR=$out/sbin MANDIR=$out/share/man/man8 \
PPPDIR=$out/etc/ppp )
''; '';
nativeBuildInputs = [ perl which ]; nativeBuildInputs = [ perl which ];