diff --git a/modules/environment/login/default.nix b/modules/environment/login/default.nix index 96b0ab2..3588bfa 100644 --- a/modules/environment/login/default.nix +++ b/modules/environment/login/default.nix @@ -82,7 +82,13 @@ in environment.files = { 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; }; }; diff --git a/pkgs/cross-compiling/cross-pkgs.nix b/pkgs/cross-compiling/cross-pkgs.nix index 814a0e6..5ea7deb 100644 --- a/pkgs/cross-compiling/cross-pkgs.nix +++ b/pkgs/cross-compiling/cross-pkgs.nix @@ -1,12 +1,14 @@ # Copyright (c) 2019-2022, see AUTHORS. Licensed under MIT License, see LICENSE. -{ config }: +#{ config }: +{ }: let loadNixpkgs = import ../lib/load-nixpkgs.nix; crossSystem = { - config = "${config.build.arch}-unknown-linux-android"; + #config = "${config.build.arch}-unknown-linux-android"; + config = "aarch64-unknown-linux-android"; sdkVer = "32"; libc = "bionic"; useAndroidPrebuilt = false;