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

Also make the bootstrap tools generation CA

Browse Source 
(And fix an ofborg eval error btw)
This commit is contained in:
regnat 2021-04-28 12:46:43 +02:00
parent 14f66d60a7
commit 4105c06bf3
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
pkgs/stdenv/linux/make-bootstrap-tools.nix
View File

@ -224,15 +224,24 @@ in with pkgs; rec {
bootstrapTools = runCommand "bootstrap-tools.tar.xz" {} "cp ${build}/on-server/bootstrap-tools.tar.xz $out"; bootstrapTools = runCommand "bootstrap-tools.tar.xz" {} "cp ${build}/on-server/bootstrap-tools.tar.xz $out";
}; };
bootstrapTools = if (stdenv.hostPlatform.libc == "glibc") then bootstrapTools =
let extraAttrs = lib.optionalAttrs
(config.contentAddressedByDefault or false)
{
__contentAddressed = true;
outputHashAlgo = "sha256";
outputHashMode = "recursive";
};
in
if (stdenv.hostPlatform.libc == "glibc") then
import ./bootstrap-tools { import ./bootstrap-tools {
inherit (stdenv.buildPlatform) system; # Used to determine where to build inherit (stdenv.buildPlatform) system; # Used to determine where to build
inherit bootstrapFiles; inherit bootstrapFiles extraAttrs;
} }
else if (stdenv.hostPlatform.libc == "musl") then else if (stdenv.hostPlatform.libc == "musl") then
import ./bootstrap-tools-musl { import ./bootstrap-tools-musl {
inherit (stdenv.buildPlatform) system; # Used to determine where to build inherit (stdenv.buildPlatform) system; # Used to determine where to build
inherit bootstrapFiles; inherit bootstrapFiles extraAttrs;
} }
else throw "unsupported libc"; else throw "unsupported libc";