diff options
| author | ajs124 <git@ajs124.de> | 2022-04-09 00:24:36 +0100 |
|---|---|---|
| committer | ajs124 <git@ajs124.de> | 2022-08-17 20:16:19 +0200 |
| commit | 5cb3e0708147327d5f5fa8c8008a06cf462210c0 (patch) | |
| tree | 8750e0dc227e026797f250ff94656718c83d2c53 /pkgs/tools/networking/openvpn/default.nix | |
| parent | 8b1f16573cc6fa50facc3fe3154ba437e64a9220 (diff) | |
openvpn*: use matching openssl version for each release
Diffstat (limited to 'pkgs/tools/networking/openvpn/default.nix')
| -rw-r--r-- | pkgs/tools/networking/openvpn/default.nix | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/pkgs/tools/networking/openvpn/default.nix b/pkgs/tools/networking/openvpn/default.nix index 71a14b169ac10..f6d4590e3185f 100644 --- a/pkgs/tools/networking/openvpn/default.nix +++ b/pkgs/tools/networking/openvpn/default.nix @@ -5,6 +5,7 @@ , iproute2 , lzo , openssl +, openssl_1_1 , pam , useSystemd ? stdenv.isLinux , systemd @@ -17,7 +18,7 @@ let inherit (lib) versionOlder optional optionals optionalString; - generic = { version, sha256 }: + generic = { version, sha256, extraBuildInputs ? [] }: let withIpRoute = stdenv.isLinux && (versionOlder version "2.5.4"); in @@ -33,11 +34,12 @@ let nativeBuildInputs = [ pkg-config ]; - buildInputs = [ lzo openssl ] + buildInputs = [ lzo ] ++ optional stdenv.isLinux pam ++ optional withIpRoute iproute2 ++ optional useSystemd systemd - ++ optional pkcs11Support pkcs11helper; + ++ optional pkcs11Support pkcs11helper + ++ extraBuildInputs; configureFlags = optionals withIpRoute [ "--enable-iproute2" @@ -75,10 +77,12 @@ in openvpn_24 = generic { version = "2.4.12"; sha256 = "1vjx82nlkxrgzfiwvmmlnz8ids5m2fiqz7scy1smh3j9jnf2v5b6"; + extraBuildInputs = [ openssl_1_1 ]; }; openvpn = generic { version = "2.5.6"; sha256 = "0gdd88rcan9vfiwkzsqn6fxxdim7kb1bsxrcra59c5xksprpwfik"; + extraBuildInputs = [ openssl ]; }; } |