diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2008-02-21 19:33:21 +0000 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2008-02-21 19:33:21 +0000 |
| commit | 96177fce34cf9996afdabf6b1e4265cb958b7598 (patch) | |
| tree | cdf0ddd4c93fa0a6e1a3316a32423f9cdfc8d1a6 /pkgs | |
| parent | a21609b1ab35db1a01ad5175e71cd39f90b4bd62 (diff) | |
VPNC: Clarify run-time dependencies.
svn path=/nixpkgs/trunk/; revision=10818
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/tools/networking/vpnc/default.nix | 20 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
2 files changed, 18 insertions, 4 deletions
diff --git a/pkgs/tools/networking/vpnc/default.nix b/pkgs/tools/networking/vpnc/default.nix index c11a4721cb744..87e979330aebe 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 65fd7af8b2648..35b078f57760d 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 { |