public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

vpnc 0.5.3.

Browse Source 
svn path=/nixpkgs/trunk/; revision=13457
This commit is contained in:
Ludovic Courtès 2008-11-27 10:32:47 +00:00
parent 2a16a3d0ab
commit f38077a30e
2 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
pkgs/tools/networking/vpnc/default.nix
View File

@ -1,21 +1,25 @@
args: with args; { stdenv, fetchurl, nettools, libgcrypt, perl, gawk, makeWrapper }:
stdenv.mkDerivation { stdenv.mkDerivation rec {
name = "vpnc-0.5.1"; name = "vpnc-0.5.3";
src = fetchurl { src = fetchurl {
url = http://www.unix-ag.uni-kl.de/~massar/vpnc/vpnc-0.5.1.tar.gz; url = "http://www.unix-ag.uni-kl.de/~massar/vpnc/${name}.tar.gz";
sha256 = "f63660bd020bbe6a39e8eb67ad60c54d719046c6198a6834371d098947f9a2ed"; sha256 = "1128860lis89g1s21hqxvap2nq426c9j4bvgghncc1zj0ays7kj6";
}; };
patches = [ ./makefile.patch ]; patches = [ ./makefile.patch ];
# The `etc/vpnc/vpnc-script' script relies on `which' and on # The `etc/vpnc/vpnc-script' script relies on `which' and on
# `ifconfig' as found in net-tools (not GNU Inetutils). # `ifconfig' as found in net-tools (not GNU Inetutils).
propagatedBuildInputs = [which nettools]; propagatedBuildInputs = [ nettools ];
buildInputs = [libgcrypt perl makeWrapper]; buildInputs = [libgcrypt perl makeWrapper];
preConfigure = '' preConfigure = ''
substituteInPlace "vpnc-script.in" \
--replace "which" "type -P" \
--replace "awk" "${gawk}/bin/awk"
substituteInPlace "config.c" \ substituteInPlace "config.c" \
--replace "/etc/vpnc/vpnc-script" "$out/etc/vpnc/vpnc-script" --replace "/etc/vpnc/vpnc-script" "$out/etc/vpnc/vpnc-script"
@ -27,7 +31,7 @@ stdenv.mkDerivation {
for i in $out/{bin,sbin}/* for i in $out/{bin,sbin}/*
do do
wrapProgram $i --prefix PATH : \ wrapProgram $i --prefix PATH : \
"${which}/bin:${nettools}/bin:${nettools}/sbin" "${nettools}/bin:${nettools}/sbin"
done done
''; '';

3
pkgs/top-level/all-packages.nix
View File

@ -1217,7 +1217,8 @@ let
}; };
vpnc = import ../tools/networking/vpnc { vpnc = import ../tools/networking/vpnc {
inherit fetchurl stdenv libgcrypt perl which nettools makeWrapper; inherit fetchurl stdenv libgcrypt perl gawk
nettools makeWrapper;
}; };
testdisk = import ../tools/misc/testdisk { testdisk = import ../tools/misc/testdisk {