ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-12-26 12:53:59 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #8294 from cheecheeo/openconnect_update

Browse Source 
openconnect: update to version 7.06 and support openssl or gnutls
This commit is contained in:
Peter Simons 2015-06-11 23:55:56 +02:00
commit b507c20ba9
2 changed files with 21 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
pkgs/tools/networking/openconnect.nix
View File

@ -1,13 +1,19 @@
{ stdenv, fetchurl, pkgconfig, vpnc, openssl, libxml2, zlib } :
{ stdenv, fetchurl, pkgconfig, vpnc, openssl ? null, gnutls ? null, libxml2, zlib } :
let
xor = a: b: (a || b) && (!(a && b));
in
assert xor (openssl != null) (gnutls != null);
stdenv.mkDerivation rec {
name = "openconnect-5.02";
name = "openconnect-7.06";
src = fetchurl {
urls = [
"ftp://ftp.infradead.org/pub/openconnect/${name}.tar.gz"
];
sha256 = "1y7dn42gd3763sgwv2j72xy9hsikd6y9x142g84kwdbn0y0psgi4";
sha256 = "1wkhmgfxkdkhy2p9w9idrgipxmxij2z4f88flfk3fifwd19nkkzs";
};
preConfigure = ''
@ -22,5 +28,6 @@ stdenv.mkDerivation rec {
"--without-openssl-version-check"
];
propagatedBuildInputs = [ vpnc openssl libxml2 zlib ];
buildInputs = [ pkgconfig ];
propagatedBuildInputs = [ vpnc openssl gnutls libxml2 zlib ];
}

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

@ -3144,7 +3144,16 @@ let
vpnc = callPackage ../tools/networking/vpnc { };
openconnect = callPackage ../tools/networking/openconnect.nix { };
openconnect = openconnect_openssl;
openconnect_openssl = callPackage ../tools/networking/openconnect.nix {
gnutls = null;
};
openconnect_gnutls = lowPrio (openconnect.override {
openssl = null;
gnutls = gnutls;
});
vtun = callPackage ../tools/networking/vtun { };