nix-community/nix-on-droid
1
0
Fork 0
mirror of https://github.com/nix-community/nix-on-droid.git synced 2025-11-08 11:36:07 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

pkgs: use non-prebuilt SDK

Browse source
This commit is contained in:
Alexander Sosedkin 2022-07-03 19:03:00 +02:00
parent 0de95f9e9f
commit 0ad6321f79
5 changed files with 38 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

22
pkgs/cross-compiling/cross-pkgs.nix
View file

@ -1,25 +1,19 @@
# Copyright (c) 2019-2021, see AUTHORS. Licensed under MIT License, see LICENSE.
# Copyright (c) 2019-2022, see AUTHORS. Licensed under MIT License, see LICENSE.
{ config, path }:
{ config }:
let
loadNixpkgs = import ../lib/load-nixpkgs.nix;
crossSystem = {
config = "${config.build.arch}-unknown-linux-android";
ndkVer = "21";
# that one is cool because it could make its way on-device one day,
# but it currently isn't static-friendly:
# sdkVer = "30";
# libc = "bionic";
# useAndroidPrebuilt = false;
# useLLVM = true;
# use that one instead
sdkVer = "29";
useAndroidPrebuilt = true;
sdkVer = "32";
libc = "bionic";
useAndroidPrebuilt = false;
useLLVM = true;
isStatic = true;
};
in
loadNixpkgs { inherit crossSystem; }

8
pkgs/cross-compiling/proot-termux.nix
View file

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