vpnc: remove unnecessary patch

We can make the same changes much less invasively using normal Nixpkgs
stuff.  This would make it easier to switch to the actively maintained
fork[1] in future.

The use of $(out)/etc instead of /etc is a bit questionable, but I
don't want to change any behaviour in this patch so I'm leaving it
alone for now.

[1]: https://davidepucci.it/doc/vpnc/

1 files changed, 11 insertions, 1 deletions

diff --git a/pkgs/tools/networking/vpnc/default.nix b/pkgs/tools/networking/vpnc/default.nix
index 6928bacd6ce..121cfef3f58 100644
--- a/pkgs/tools/networking/vpnc/default.nix
+++ b/pkgs/tools/networking/vpnc/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation {
     rm -r $sourceRoot/{trunk,branches,tags}
   '';
 
-  patches = [ ./makefile.patch ./no_default_route_when_netmask.patch ];
+  patches = [ ./no_default_route_when_netmask.patch ];
 
   # The `etc/vpnc/vpnc-script' script relies on `which' and on
   # `ifconfig' as found in net-tools (not GNU Inetutils).
@@ -23,6 +23,16 @@ stdenv.mkDerivation {
   nativeBuildInputs = [ makeWrapper ];
   buildInputs = [libgcrypt perl openssl ];
 
+  makeFlags = [
+    "PREFIX=$(out)"
+    "ETCDIR=$(out)/etc/vpnc"
+    "SCRIPT_PATH=$(out)/etc/vpnc/vpnc-script"
+  ];
+
+  postPatch = ''
+    patchShebangs makeman.pl
+  '';
+
   preConfigure = ''
     sed -i 's|^#OPENSSL|OPENSSL|g' Makefile