Commit 4105c06b authored by regnat's avatar regnat
Browse files

Also make the bootstrap tools generation CA 

(And fix an ofborg eval error btw)
parent 14f66d60

pkgs/stdenv/linux/make-bootstrap-tools.nix

+12 −3
Original line number Diff line number Diff line
@@ -224,15 +224,24 @@ in with pkgs; rec { 
    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 {

      inherit (stdenv.buildPlatform) system; # Used to determine where to build

      inherit bootstrapFiles;

      inherit bootstrapFiles extraAttrs;

    }

    else if (stdenv.hostPlatform.libc == "musl") then

    import ./bootstrap-tools-musl {

      inherit (stdenv.buildPlatform) system; # Used to determine where to build

      inherit bootstrapFiles;

      inherit bootstrapFiles extraAttrs;

    }

    else throw "unsupported libc";