Merge pull request #71318 from tricktron/fixOpenConnectOnCatalina
openconnect: Add darwin support
This commit is contained in:
commit
7fb0d95ca1
@ -6787,6 +6787,12 @@
|
|||||||
githubId = 1312290;
|
githubId = 1312290;
|
||||||
name = "Trevor Joynson";
|
name = "Trevor Joynson";
|
||||||
};
|
};
|
||||||
|
tricktron = {
|
||||||
|
email = "tgagnaux@gmail.com";
|
||||||
|
github = "tricktron";
|
||||||
|
githubId = 16036882;
|
||||||
|
name = "Thibault Gagnaux";
|
||||||
|
};
|
||||||
trino = {
|
trino = {
|
||||||
email = "muehlhans.hubert@ekodia.de";
|
email = "muehlhans.hubert@ekodia.de";
|
||||||
github = "hmuehlhans";
|
github = "hmuehlhans";
|
||||||
|
@ -1,8 +1,14 @@
|
|||||||
{ stdenv, fetchurl, pkgconfig, vpnc, openssl ? null, gnutls ? null, gmp, libxml2, stoken, zlib } :
|
{ stdenv, fetchurl, pkgconfig, openssl ? null, gnutls ? null, gmp, libxml2, stoken, zlib, fetchgit, darwin } :
|
||||||
|
|
||||||
assert (openssl != null) == (gnutls == null);
|
assert (openssl != null) == (gnutls == null);
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
let vpnc = fetchgit {
|
||||||
|
url = "git://git.infradead.org/users/dwmw2/vpnc-scripts.git";
|
||||||
|
rev = "c84fb8e5a523a647a01a1229a9104db934e19f00";
|
||||||
|
sha256 = "01xdclx0y3x66mpbdr77n4ilapwzjz475h32q88ml9gnq6phjxrs";
|
||||||
|
};
|
||||||
|
|
||||||
|
in stdenv.mkDerivation rec {
|
||||||
pname = "openconnect";
|
pname = "openconnect";
|
||||||
version = "8.05";
|
version = "8.05";
|
||||||
|
|
||||||
@ -14,21 +20,22 @@ stdenv.mkDerivation rec {
|
|||||||
};
|
};
|
||||||
|
|
||||||
outputs = [ "out" "dev" ];
|
outputs = [ "out" "dev" ];
|
||||||
|
|
||||||
configureFlags = [
|
configureFlags = [
|
||||||
"--with-vpnc-script=${vpnc}/etc/vpnc/vpnc-script"
|
"--with-vpnc-script=${vpnc}/vpnc-script"
|
||||||
"--disable-nls"
|
"--disable-nls"
|
||||||
"--without-openssl-version-check"
|
"--without-openssl-version-check"
|
||||||
];
|
];
|
||||||
|
|
||||||
|
buildInputs = [ openssl gnutls gmp libxml2 stoken zlib ]
|
||||||
|
++ stdenv.lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.PCSC;
|
||||||
nativeBuildInputs = [ pkgconfig ];
|
nativeBuildInputs = [ pkgconfig ];
|
||||||
propagatedBuildInputs = [ vpnc openssl gnutls gmp libxml2 stoken zlib ];
|
|
||||||
|
|
||||||
meta = {
|
meta = with stdenv.lib; {
|
||||||
description = "VPN Client for Cisco's AnyConnect SSL VPN";
|
description = "VPN Client for Cisco's AnyConnect SSL VPN";
|
||||||
homepage = http://www.infradead.org/openconnect/;
|
homepage = http://www.infradead.org/openconnect/;
|
||||||
license = stdenv.lib.licenses.lgpl21;
|
license = licenses.lgpl21;
|
||||||
maintainers = with stdenv.lib.maintainers; [ pradeepchhetri ];
|
maintainers = with maintainers; [ pradeepchhetri tricktron ];
|
||||||
platforms = stdenv.lib.platforms.linux;
|
platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin;
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user