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: update toolchain and nixpkgs for 21.05

Browse source
This commit is contained in:
Alexander Sosedkin 2021-06-19 04:55:55 +02:00
parent 97fdc4c6b2
commit 9fcce0d7df
3 changed files with 21 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1,18 +1,23 @@
# Copyright (c) 2019-2020, see AUTHORS. Licensed under MIT License, see LICENSE.
# Copyright (c) 2019-2021, see AUTHORS. Licensed under MIT License, see LICENSE.
{ config, libjpeg, path }:
{ config, path }:
let
loadNixpkgs = import ../lib/load-nixpkgs.nix;
overlayJpegNoStatic = self: super: {
inherit libjpeg;
};
crossSystem = {
config = "${config.build.arch}-unknown-linux-android";
sdkVer = "24";
ndkVer = "18b";
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;
};
in
@ -25,7 +30,6 @@ in
crossOverlays = [
(import "${path}/pkgs/top-level/static.nix")
overlayJpegNoStatic
];
};
}