bootstrap: flakify bootstrap zip ball generation

This commit is contained in:
Tobias Happ 2022-09-24 13:49:51 +02:00
parent b10dd78e18
commit 274bb4babd
8 changed files with 58 additions and 40 deletions

View file

@ -1,9 +1,9 @@
# Copyright (c) 2019-2022, see AUTHORS. Licensed under MIT License, see LICENSE.
{ config }:
{ config, nixpkgs, system }:
let
loadNixpkgs = import ../lib/load-nixpkgs.nix;
{
inherit system;
crossSystem = {
config = "${config.build.arch}-unknown-linux-android";
@ -13,7 +13,4 @@ let
useLLVM = true;
isStatic = true;
};
in
loadNixpkgs { inherit crossSystem; }
}

View file

@ -1,12 +1,12 @@
# Copyright (c) 2019-2022, see AUTHORS. Licensed under MIT License, see LICENSE.
{ callPackage, tallocStatic }:
{ callPackage, nixpkgs, tallocStatic }:
let
pkgsCross = callPackage ./cross-pkgs.nix { };
pkgsCross = import nixpkgs (callPackage ./cross-pkgs-args.nix { });
stdenv = pkgsCross.stdenvAdapters.makeStaticBinaries pkgsCross.stdenv;
in
pkgsCross.callPackage ../proot-termux {
talloc = tallocStatic;
inherit stdenv;

View file

@ -1,6 +1,7 @@
# Copyright (c) 2019-2022, see AUTHORS. Licensed under MIT License, see LICENSE.
{ callPackage
, nixpkgs
, fetchurl
, python3
, pkg-config
@ -8,7 +9,7 @@
}:
let
pkgsCross = callPackage ./cross-pkgs.nix { };
pkgsCross = import nixpkgs (callPackage ./cross-pkgs-args.nix { });
in
pkgsCross.stdenv.mkDerivation rec {