diff options
| author | Janne Heß <janne@hess.ooo> | 2021-11-07 21:48:54 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-11-07 21:48:54 +0100 |
| commit | 17f230461a1010cdb0d0bb92594546429c69de47 (patch) | |
| tree | 3957d52c005a34f561637df7fffe3181846f196d /pkgs/tools/networking/vpnc | |
| parent | b7aa73352baa217d18cc1c97b93c44d044e8237a (diff) | |
| parent | ab9ecf61c70d445fdcfdf47ae6a8629767304cde (diff) | |
| download | nixpkgs-17f230461a1010cdb0d0bb92594546429c69de47.tar nixpkgs-17f230461a1010cdb0d0bb92594546429c69de47.tar.gz nixpkgs-17f230461a1010cdb0d0bb92594546429c69de47.tar.bz2 nixpkgs-17f230461a1010cdb0d0bb92594546429c69de47.tar.lz nixpkgs-17f230461a1010cdb0d0bb92594546429c69de47.tar.xz nixpkgs-17f230461a1010cdb0d0bb92594546429c69de47.tar.zst nixpkgs-17f230461a1010cdb0d0bb92594546429c69de47.zip | |
Merge pull request #144541 from alyssais/vpnc-makefile-patch
vpnc: remove unnecessary patch
Diffstat (limited to 'pkgs/tools/networking/vpnc')
| -rw-r--r-- | pkgs/tools/networking/vpnc/default.nix | 12 | ||||
| -rw-r--r-- | pkgs/tools/networking/vpnc/makefile.patch | 22 |
2 files changed, 11 insertions, 23 deletions
diff --git a/pkgs/tools/networking/vpnc/default.nix b/pkgs/tools/networking/vpnc/default.nix index d5fa25b0e44..f67d29f09d4 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 diff --git a/pkgs/tools/networking/vpnc/makefile.patch b/pkgs/tools/networking/vpnc/makefile.patch deleted file mode 100644 index 89a8cd6da95..00000000000 --- a/pkgs/tools/networking/vpnc/makefile.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- vpnc-0.5.1.orig/Makefile 2008-02-10 22:22:43.000000000 +0100 -+++ vpnc-0.5.1/Makefile 2008-02-10 22:22:32.000000000 +0100 -@@ -20,8 +20,8 @@ - # $Id: Makefile 236 2007-09-05 20:40:59Z Joerg Mayer $ - - DESTDIR= --PREFIX=/usr/local --ETCDIR=/etc/vpnc -+PREFIX=$(out) -+ETCDIR=$(out)/etc/vpnc - BINDIR=$(PREFIX)/bin - SBINDIR=$(PREFIX)/sbin - MANDIR=$(PREFIX)/share/man -@@ -71,7 +71,7 @@ - $(CC) -o $@ $^ $(LDFLAGS) - - vpnc.8 : vpnc.8.template makeman.pl vpnc -- ./makeman.pl -+ perl makeman.pl - - cisco-decrypt : cisco-decrypt.o config.o supp.o sysdep.o vpnc-debug.o - $(CC) -o $@ $^ $(LDFLAGS) |