From b99fc79f5deb6b4099f70455ea888e9f653000e1 Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Thu, 2 Feb 2023 11:11:23 -0500
Subject: [PATCH 1/2] stunnel: Add optional systemd support

This allows for socket activation of stunnel itself.

Co-authored-by: Artturi <Artturin@artturin.com>
---
 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 = ''

From 1a41a44328b08286dcd1d1d93ab9bc4b41d1e1d7 Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Thu, 2 Feb 2023 11:15:41 -0500
Subject: [PATCH 2/2] stunnel: Multiple outputs, parallel building

---
 pkgs/tools/networking/stunnel/default.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/tools/networking/stunnel/default.nix b/pkgs/tools/networking/stunnel/default.nix
index ee408e7c2373..4be019c5fa07 100644
--- a/pkgs/tools/networking/stunnel/default.nix
+++ b/pkgs/tools/networking/stunnel/default.nix
@@ -8,6 +8,8 @@ stdenv.mkDerivation rec {
   pname = "stunnel";
   version = "5.67";
 
+  outputs = [ "out" "doc" "man" ];
+
   src = fetchurl {
     url    = "https://www.stunnel.org/archive/${lib.versions.major version}.x/${pname}-${version}.tar.gz";
     sha256 = "3086939ee6407516c59b0ba3fbf555338f9d52f459bcab6337c0f00e91ea8456";
@@ -15,6 +17,8 @@ stdenv.mkDerivation rec {
     # not the output of `nix-prefetch-url`
   };
 
+  enableParallelBuilding = true;
+
   buildInputs = [
     openssl
   ] ++ lib.optionals systemdSupport [