pptp: rework packaging, fix cross compilation

1 files changed, 17 insertions, 9 deletions

diff --git a/pkgs/tools/networking/pptp/default.nix b/pkgs/tools/networking/pptp/default.nix
index 142105e202835..4bc0ed3219fa7 100644
--- a/pkgs/tools/networking/pptp/default.nix
+++ b/pkgs/tools/networking/pptp/default.nix
@@ -13,22 +13,30 @@ stdenv.mkDerivation rec {
     substituteInPlace Makefile --replace 'install -o root' 'install'
   '';
 
-  preConfigure = ''
-    makeFlagsArray=( IP=${iproute2}/bin/ip PPPD=${ppp}/sbin/pppd \
-                     BINDIR=$out/sbin MANDIR=$out/share/man/man8 \
-                     PPPDIR=$out/etc/ppp )
-  '';
+  makeFlags = [
+    "CC:=$(CC)"
+    "IP=${iproute2}/bin/ip"
+    "PPPD=${ppp}/bin/pppd"
+    "BINDIR=${placeholder "out"}/sbin"
+    "MANDIR=${placeholder "out"}/share/man/man8"
+    "PPPDIR=${placeholder "out"}/etc/ppp"
+  ];
 
-  buildInputs = [ perl ];
+  strictDeps = true;
 
-  postFixup = ''
-    patchShebangs $out
-  '';
+  nativeBuildInputs = [
+    perl # pod2man
+  ];
+
+  buildInputs = [
+    perl # in shebang of pptpsetup
+  ];
 
   meta = with lib; {
     description = "PPTP client for Linux";
     homepage = "https://pptpclient.sourceforge.net/";
     license = licenses.gpl2;
     platforms = platforms.linux;
+    maintainers = with maintainers; [ nickcao ];
   };
 }