JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

s6-networking: default to bearssl

Browse Source 
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
This commit is contained in:
Profpatsch 2021-03-21 19:56:02 +01:00
parent cda3ea1b72
commit 841b753e92
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/tools/networking/s6-networking/default.nix
View File

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