From b99fc79f5deb6b4099f70455ea888e9f653000e1 Mon Sep 17 00:00:00 2001 From: John Ericson Date: Thu, 2 Feb 2023 11:11:23 -0500 Subject: [PATCH] stunnel: Add optional systemd support This allows for socket activation of stunnel itself. Co-authored-by: Artturi --- pkgs/tools/networking/stunnel/default.nix | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/stunnel/default.nix b/pkgs/tools/networking/stunnel/default.nix index 244dd3bbcdc0..ee408e7c2373 100644 --- a/pkgs/tools/networking/stunnel/default.nix +++ b/pkgs/tools/networking/stunnel/default.nix @@ -1,4 +1,8 @@ -{ lib, stdenv, fetchurl, openssl, nixosTests }: +{ lib, stdenv, fetchurl, openssl +, systemdSupport ? lib.meta.availableOn stdenv.hostPlatform systemd, systemd +, nixosTests +}: + stdenv.mkDerivation rec { pname = "stunnel"; @@ -11,11 +15,17 @@ stdenv.mkDerivation rec { # not the output of `nix-prefetch-url` }; - buildInputs = [ openssl ]; + buildInputs = [ + openssl + ] ++ lib.optionals systemdSupport [ + systemd + ]; + configureFlags = [ "--with-ssl=${openssl.dev}" "--sysconfdir=/etc" "--localstatedir=/var" + (lib.enableFeature systemdSupport "systemd") ]; postInstall = ''