diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2023-10-13 18:01:31 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-10-13 18:01:31 +0000 |
| commit | c68d98e9d41f96cf3d591f8d5a7abfdb2b292799 (patch) | |
| tree | be6df5adcc1528f56a1204acff4eaf2cfd1cefb6 /pkgs/tools/networking/openvpn3/default.nix | |
| parent | 68ba5fd2ed8be749cf1865ed9a71667dfda944a7 (diff) | |
| parent | 4a7eb88e55f80623bb3ea4968ff4600814016ffb (diff) | |
| download | nixlib-c68d98e9d41f96cf3d591f8d5a7abfdb2b292799.tar nixlib-c68d98e9d41f96cf3d591f8d5a7abfdb2b292799.tar.gz nixlib-c68d98e9d41f96cf3d591f8d5a7abfdb2b292799.tar.bz2 nixlib-c68d98e9d41f96cf3d591f8d5a7abfdb2b292799.tar.lz nixlib-c68d98e9d41f96cf3d591f8d5a7abfdb2b292799.tar.xz nixlib-c68d98e9d41f96cf3d591f8d5a7abfdb2b292799.tar.zst nixlib-c68d98e9d41f96cf3d591f8d5a7abfdb2b292799.zip | |
Merge staging-next into staging
Diffstat (limited to 'pkgs/tools/networking/openvpn3/default.nix')
| -rw-r--r-- | pkgs/tools/networking/openvpn3/default.nix | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/pkgs/tools/networking/openvpn3/default.nix b/pkgs/tools/networking/openvpn3/default.nix index 295055d797d2..b6037d67d824 100644 --- a/pkgs/tools/networking/openvpn3/default.nix +++ b/pkgs/tools/networking/openvpn3/default.nix @@ -15,6 +15,8 @@ , pkg-config , protobuf , python3 +, systemd +, enableSystemdResolved ? false , tinyxml-2 , wrapGAppsHook }: @@ -80,6 +82,8 @@ stdenv.mkDerivation rec { openssl protobuf tinyxml-2 + ] ++ lib.optionals enableSystemdResolved [ + systemd ]; # runtime deps @@ -101,6 +105,10 @@ stdenv.mkDerivation rec { "--enable-addons-aws" "--disable-selinux-build" "--disable-build-test-progs" + ] ++ lib.optionals enableSystemdResolved [ + # This defaults to --resolv-conf /etc/resolv.conf. See + # https://github.com/OpenVPN/openvpn3-linux/blob/v20/configure.ac#L434 + "DEFAULT_DNS_RESOLVER=--systemd-resolved" ]; NIX_LDFLAGS = "-lpthread"; |