diff options
author | John Chee <cheecheeo@gmail.com> | 2015-06-11 10:52:00 -0700 |
---|---|---|
committer | John Chee <cheecheeo@gmail.com> | 2015-06-11 11:56:18 -0700 |
commit | 85da7792b8bfa6be2f8d72d2cd51d1429b1f6ba8 (patch) | |
tree | e815eda841e8542dc321575b57035fe0ac0948fb /pkgs/tools/networking | |
parent | 7a0ca5226727911bc6f3e7148407701d611d783d (diff) | |
download | nixlib-85da7792b8bfa6be2f8d72d2cd51d1429b1f6ba8.tar nixlib-85da7792b8bfa6be2f8d72d2cd51d1429b1f6ba8.tar.gz nixlib-85da7792b8bfa6be2f8d72d2cd51d1429b1f6ba8.tar.bz2 nixlib-85da7792b8bfa6be2f8d72d2cd51d1429b1f6ba8.tar.lz nixlib-85da7792b8bfa6be2f8d72d2cd51d1429b1f6ba8.tar.xz nixlib-85da7792b8bfa6be2f8d72d2cd51d1429b1f6ba8.tar.zst nixlib-85da7792b8bfa6be2f8d72d2cd51d1429b1f6ba8.zip |
openconnect: update to version 7.06 and support openssl or gnutls
Diffstat (limited to 'pkgs/tools/networking')
-rw-r--r-- | pkgs/tools/networking/openconnect.nix | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/pkgs/tools/networking/openconnect.nix b/pkgs/tools/networking/openconnect.nix index d53af5c9e40d..54239b766174 100644 --- a/pkgs/tools/networking/openconnect.nix +++ b/pkgs/tools/networking/openconnect.nix @@ -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 ]; } |