This commit is contained in:
Alexander Sosedkin 2022-07-09 14:08:11 +02:00
parent 2ff75c4eca
commit 9dfa32878b
2 changed files with 11 additions and 3 deletions

View file

@ -82,7 +82,13 @@ in
environment.files = { environment.files = {
inherit login loginInner; inherit login loginInner;
prootStatic = customPkgs.prootTermux; prootStatic =
let
nixpkgs = import ../../../pkgs/cross-compiling/cross-pkgs.nix { };
tallocStatic = nixpkgs.callPackage ../../../pkgs/cross-compiling/talloc-static.nix { };
prootTermux = nixpkgs.callPackage ../../../pkgs/cross-compiling/proot-termux.nix { inherit tallocStatic; };
in
prootTermux;
}; };
}; };

View file

@ -1,12 +1,14 @@
# Copyright (c) 2019-2022, see AUTHORS. Licensed under MIT License, see LICENSE. # Copyright (c) 2019-2022, see AUTHORS. Licensed under MIT License, see LICENSE.
{ config }: #{ config }:
{ }:
let let
loadNixpkgs = import ../lib/load-nixpkgs.nix; loadNixpkgs = import ../lib/load-nixpkgs.nix;
crossSystem = { crossSystem = {
config = "${config.build.arch}-unknown-linux-android"; #config = "${config.build.arch}-unknown-linux-android";
config = "aarch64-unknown-linux-android";
sdkVer = "32"; sdkVer = "32";
libc = "bionic"; libc = "bionic";
useAndroidPrebuilt = false; useAndroidPrebuilt = false;