diff --git a/pkgs/tools/networking/vpnc/default.nix b/pkgs/tools/networking/vpnc/default.nix index c11a4721cb7..87e979330ae 100644 --- a/pkgs/tools/networking/vpnc/default.nix +++ b/pkgs/tools/networking/vpnc/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, libgcrypt, perl}: +args: with args; stdenv.mkDerivation { name = "vpnc-0.5.1"; @@ -9,11 +9,25 @@ stdenv.mkDerivation { patches = [ ./makefile.patch ]; - buildInputs = [libgcrypt perl]; + # The `etc/vpnc/vpnc-script' script relies on `which' and on + # `ifconfig' as found in net-tools (not GNU Inetutils). + propagatedBuildInputs = [which nettools]; + + buildInputs = [libgcrypt perl makeWrapper]; + builder = ./builder.sh; + postInstall = '' + for i in $out/{bin,sbin}/* + do + wrapProgram $i --prefix PATH : \ + "${which}/bin:${nettools}/bin:${nettools}/sbin" + done + ''; + meta = { - description = "VPNC, a virtual private network (VPN) client for Cisco's VPN concentrators"; + description = ''VPNC, a virtual private network (VPN) client + for Cisco's VPN concentrators.''; homepage = http://www.unix-ag.uni-kl.de/~massar/vpnc/; license = "GPL"; }; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 65fd7af8b26..35b078f5776 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -878,7 +878,7 @@ rec { }; vpnc = import ../tools/networking/vpnc { - inherit fetchurl stdenv libgcrypt perl; + inherit fetchurl stdenv libgcrypt perl which nettools makeWrapper; }; testdisk = import ../tools/misc/testdisk {