nix-community/nix-on-droid
1
0
Fork 0
mirror of https://github.com/nix-community/nix-on-droid.git synced 2025-11-08 19:46: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

6
modules/environment/login/default.nix
View file

@ -1,4 +1,4 @@
# 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, lib, pkgs, customPkgs, ... }: { config, lib, pkgs, customPkgs, ... }:
@ -85,8 +85,8 @@ in
prootStatic = prootStatic =
let let
crossCompiledPaths = { crossCompiledPaths = {
aarch64 = "/nix/store/ly8ffgwwg7xsgqfcw865vdi0bqaj4vp9-proot-termux-unstable-2020-10-25-aarch64-unknown-linux-android"; aarch64 = "/nix/store/0xfjhi3529lzym7z7025xs7kignmgy0r-proot-termux-aarch64-unknown-linux-android-unstable-2020-10-25";
i686 = "/nix/store/9kgif2f321vrbjd7x0pj7rcyg84zrhgz-proot-termux-unstable-2020-10-25-i686-unknown-linux-android"; i686 = "/nix/store/jl91v6ya3ablh8v41k63vcwsim5b4v1s-proot-termux-i686-unknown-linux-android-unstable-2020-10-25";
}; };
in in
"${crossCompiledPaths.${config.build.arch}}"; "${crossCompiledPaths.${config.build.arch}}";

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 let
loadNixpkgs = import ../lib/load-nixpkgs.nix; loadNixpkgs = import ../lib/load-nixpkgs.nix;
overlayJpegNoStatic = self: super: {
inherit libjpeg;
};
crossSystem = { crossSystem = {
config = "${config.build.arch}-unknown-linux-android"; config = "${config.build.arch}-unknown-linux-android";
sdkVer = "24"; ndkVer = "21";
ndkVer = "18b";
# 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; useAndroidPrebuilt = true;
}; };
in in
@ -25,7 +30,6 @@ in
crossOverlays = [ crossOverlays = [
(import "${path}/pkgs/top-level/static.nix") (import "${path}/pkgs/top-level/static.nix")
overlayJpegNoStatic
]; ];
}; };
} }

23
pkgs/lib/load-nixpkgs.nix
View file

@ -1,29 +1,16 @@
# Copyright (c) 2019-2020, see AUTHORS. Licensed under MIT License, see LICENSE. # Copyright (c) 2019-2021, see AUTHORS. Licensed under MIT License, see LICENSE.
let let
defaultNixpkgsArgs = { defaultNixpkgsArgs = {
config = { }; config = { };
overlays = [ overlays = [ ];
(self: super: {
gdb = super.gdb.override {
# actual default value of safePaths, but `lib` does not exist when cross-compiling:
# [
# # $debugdir:$datadir/auto-load are whitelisted by default by GDB
# "$debugdir" "$datadir/auto-load"
# # targetPackages so we get the right libc when cross-compiling and using buildPackages.gdb
# targetPackages.stdenv.cc.cc.lib
# ]
safePaths = [ "$debugdir" "$datadir/auto-load" ];
};
})
];
}; };
# head of nixos-20.09 as of 2020-11-07 # head of nixos-21.05 as of 2021-06-24
# note: when updating nixpkgs, update store paths of proot-termux in modules/environment/login/default.nix # note: when updating nixpkgs, update store paths of proot-termux in modules/environment/login/default.nix
pinnedPkgsSrc = builtins.fetchTarball { pinnedPkgsSrc = builtins.fetchTarball {
url = "https://github.com/NixOS/nixpkgs/archive/d105075a1fd870b1d1617a6008cb38b443e65433.tar.gz"; url = "https://github.com/NixOS/nixpkgs/archive/0b8b127125e5271f5c8636680b6fe274844aaa9d.tar.gz";
sha256 = "1jcs44wn0s6mlf2jps25bvcai1rij9b2dil6zcj8zqwf2i8xmqjh"; sha256 = "1rjb1q28ivaf20aqj3v60kzjyi5lqb3krag0k8wwjqch45ik2f86";
}; };
in in