mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-10-30 14:11:21 +00:00
openvpn: 2.5.8 -> 2.6.8
This commit is contained in:
parent
dd8e82f3b4
commit
3deee92686
@ -3,6 +3,9 @@
|
||||
, fetchurl
|
||||
, pkg-config
|
||||
, iproute2
|
||||
, libcap_ng
|
||||
, libnl
|
||||
, lz4
|
||||
, lzo
|
||||
, openssl
|
||||
, pam
|
||||
@ -16,7 +19,7 @@
|
||||
let
|
||||
inherit (lib) versionOlder optional optionals optionalString;
|
||||
|
||||
generic = { version, sha256, extraBuildInputs ? [] }:
|
||||
generic = { version, sha256, extraBuildInputs ? [ ] }:
|
||||
let
|
||||
withIpRoute = stdenv.isLinux && (versionOlder version "2.5.4");
|
||||
in
|
||||
@ -32,8 +35,8 @@ let
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
buildInputs = [ lzo ]
|
||||
++ optional stdenv.isLinux pam
|
||||
buildInputs = [ lz4 lzo ]
|
||||
++ optionals stdenv.isLinux [ libcap_ng libnl pam ]
|
||||
++ optional withIpRoute iproute2
|
||||
++ optional useSystemd systemd
|
||||
++ optional pkcs11Support pkcs11helper
|
||||
@ -73,8 +76,8 @@ let
|
||||
in
|
||||
{
|
||||
openvpn = generic {
|
||||
version = "2.5.8";
|
||||
sha256 = "1cixqm4gn2d1v8qkbww75j30fzvxz13gc7whcmz54i0x4fvibwx6";
|
||||
version = "2.6.8";
|
||||
sha256 = "sha256-Xt4VZcim2IAQD38jUxen7p7qg9UFLbVUfxOp52r3gF0=";
|
||||
extraBuildInputs = [ openssl ];
|
||||
};
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user