From 841b753e92328f639eb1cb2ccbb7b5cebd733258 Mon Sep 17 00:00:00 2001
From: Profpatsch <mail@profpatsch.de>
Date: Sun, 21 Mar 2021 19:56:02 +0100
Subject: [PATCH] s6-networking: default to bearssl
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

18·27 <Profpatsch> skarnet: would you recommend putting bearssl as the default backend for s6-networking?
18·27 <Profpatsch> uh, bearssl isn’t even packaged
18·27 <Profpatsch> yak shave
18·28 <Profpatsch> skarnet: The current backend uses libressl
18·29 <@skarnet> well at least CAFILE works
18·29 <@skarnet> but yes, I would recommend putting bearssl as the default backend
---
 pkgs/tools/networking/s6-networking/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/tools/networking/s6-networking/default.nix b/pkgs/tools/networking/s6-networking/default.nix
index 6159201bac8ce1..3d72b61431a7b3 100644
--- a/pkgs/tools/networking/s6-networking/default.nix
+++ b/pkgs/tools/networking/s6-networking/default.nix
@@ -1,9 +1,8 @@
 { lib, stdenv, skawarePackages
 
 # Whether to build the TLS/SSL tools and what library to use
-# acceptable values: "libressl", false
-# TODO: add bearssl
-, sslSupport ? "libressl" , libressl
+# acceptable values: "bearssl", "libressl", false
+, sslSupport ? "bearssl" , libressl, bearssl
 }:
 
 with skawarePackages;
@@ -11,6 +10,7 @@ let
   sslSupportEnabled = sslSupport != false;
   sslLibs = {
     libressl = libressl;
+    bearssl = bearssl;
   };
 
 in
@@ -58,7 +58,7 @@ buildPackage {
     # remove all s6 executables from build directory
     rm $(find -name "s6-*" -type f -mindepth 1 -maxdepth 1 -executable)
     rm minidentd
-    rm libs6net.* libstls.* libs6tls.*
+    rm libs6net.* libstls.* libs6tls.* libsbearssl.*
 
     mv doc $doc/share/doc/s6-networking/html
   '';