ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-11-11 15:27:20 +03:00
Code Issues Projects Releases Wiki Activity

openvpn*: use matching openssl version for each release

Browse Source
This commit is contained in:
ajs124 2022-04-09 00:24:36 +01:00
parent 8b1f16573c
commit 5cb3e07081
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/tools/networking/openvpn/default.nix
View File

@ -5,6 +5,7 @@
, iproute2 , iproute2
, lzo , lzo
, openssl , openssl
, openssl_1_1
, pam , pam
, useSystemd ? stdenv.isLinux , useSystemd ? stdenv.isLinux
, systemd , systemd
@ -17,7 +18,7 @@
let let
inherit (lib) versionOlder optional optionals optionalString; inherit (lib) versionOlder optional optionals optionalString;
generic = { version, sha256 }: generic = { version, sha256, extraBuildInputs ? [] }:
let let
withIpRoute = stdenv.isLinux && (versionOlder version "2.5.4"); withIpRoute = stdenv.isLinux && (versionOlder version "2.5.4");
in in
@ -33,11 +34,12 @@ let
nativeBuildInputs = [ pkg-config ]; nativeBuildInputs = [ pkg-config ];
buildInputs = [ lzo openssl ] buildInputs = [ lzo ]
++ optional stdenv.isLinux pam ++ optional stdenv.isLinux pam
++ optional withIpRoute iproute2 ++ optional withIpRoute iproute2
++ optional useSystemd systemd ++ optional useSystemd systemd
++ optional pkcs11Support pkcs11helper; ++ optional pkcs11Support pkcs11helper
++ extraBuildInputs;
configureFlags = optionals withIpRoute [ configureFlags = optionals withIpRoute [
"--enable-iproute2" "--enable-iproute2"
@ -75,10 +77,12 @@ in
openvpn_24 = generic { openvpn_24 = generic {
version = "2.4.12"; version = "2.4.12";
sha256 = "1vjx82nlkxrgzfiwvmmlnz8ids5m2fiqz7scy1smh3j9jnf2v5b6"; sha256 = "1vjx82nlkxrgzfiwvmmlnz8ids5m2fiqz7scy1smh3j9jnf2v5b6";
extraBuildInputs = [ openssl_1_1 ];
}; };
openvpn = generic { openvpn = generic {
version = "2.5.6"; version = "2.5.6";
sha256 = "0gdd88rcan9vfiwkzsqn6fxxdim7kb1bsxrcra59c5xksprpwfik"; sha256 = "0gdd88rcan9vfiwkzsqn6fxxdim7kb1bsxrcra59c5xksprpwfik";
extraBuildInputs = [ openssl ];
}; };
} }