aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorQyriad <qyriad@qyriad.me>2024-04-12 06:45:51 -0600
committerQyriad <qyriad@qyriad.me>2024-04-12 07:04:37 -0600
commita3be742bda0ca81dc9f340b29c522f97834f2155 (patch)
treef165c8ff5a3fb0afe09b26457201c795c225c2ba
parent629351163dd20ecc40e4b69366c283f8da9b2972 (diff)
binary tarball: include cacert in root paths
93cc06334 removed nss-cacert from the binary tarball, but they're necessary for global compatibility (and for our installer). This is what results in cacerts being in the default profile, so e.g. the daemon has TLS certs without having to use the system ones. There's a fallback behavior in the daemon script in case these wind up missing from the profile, but we don't want to have to rely on that, since the fallback fails if it doesn't recognize one of a handful of distros. Change-Id: I60d8e6f734469548e80d5f38113ef168f67cbf7d
-rw-r--r--nix-support/binary-tarball.nix8
1 files changed, 7 insertions, 1 deletions
diff --git a/nix-support/binary-tarball.nix b/nix-support/binary-tarball.nix
index 88c556c33..b73e59043 100644
--- a/nix-support/binary-tarball.nix
+++ b/nix-support/binary-tarball.nix
@@ -1,11 +1,17 @@
{
buildPackages,
+ cacert,
nix,
system,
version,
}:
let
- installerClosureInfo = buildPackages.closureInfo { rootPaths = [ nix ]; };
+ installerClosureInfo = buildPackages.closureInfo {
+ rootPaths = [
+ nix
+ cacert
+ ];
+ };
meta.description = "Distribution-independent Nix bootstrap binaries for ${system}";
in