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

Update pinned nixpkgs version

Browse source
This commit is contained in:
Tobias Happ 2020-06-12 09:33:59 +02:00
parent a161037b9f
commit 6012e0a8e6
3 changed files with 22 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -85,8 +85,8 @@ in
prootStatic = prootStatic =
let let
crossCompiledPaths = { crossCompiledPaths = {
aarch64 = "/nix/store/r09n7pp4fwhrld2a1k2al6bgdx2qqfaj-proot-termux-unstable-2019-09-05-aarch64-unknown-linux-android"; aarch64 = "/nix/store/h27cfpnfzxv2m92bg9lsgpg6520cz0hz-proot-termux-unstable-2020-04-25-aarch64-unknown-linux-android";
i686 = "/nix/store/4gpm0rmrq0mm69kl3cb1gjslr7ihhp01-proot-termux-unstable-2019-09-05-i686-unknown-linux-android"; i686 = "/nix/store/kz8lil7m0c4cjk2rv4skicalr31a47dv-proot-termux-unstable-2020-04-25-i686-unknown-linux-android";
}; };
in in
"${crossCompiledPaths.${config.build.arch}}"; "${crossCompiledPaths.${config.build.arch}}";

5
overlays/lib/nixpkgs.nix
View file

@ -3,11 +3,12 @@
{ super }: { super }:
let let
# head of nixos-20.03 as of 2020-06-11
pinnedPkgsSrc = super.fetchFromGitHub { pinnedPkgsSrc = super.fetchFromGitHub {
owner = "NixOS"; owner = "NixOS";
repo = "nixpkgs"; repo = "nixpkgs";
rev = "7e8454fb856573967a70f61116e15f879f2e3f6a"; rev = "8b071be7512bd2cd0ff5c3bdf60f01ab4eb94abd";
sha256 = "0lnbjjvj0ivpi9pxar0fyk8ggybxv70c5s0hpsqf5d71lzdpxpj8"; sha256 = "079rzd17y2pk48kh70pbp4a7mh56vi2b49lzd365ckh38gdv702z";
}; };
in in

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

@ -3,14 +3,27 @@
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-19.09 as of 2019-11-28 # head of nixos-20.03 as of 2020-06-11
# 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/73fb59dbb89ed5f754249761dcd99c6ccbd24bb5.tar.gz"; url = "https://github.com/NixOS/nixpkgs/archive/8b071be7512bd2cd0ff5c3bdf60f01ab4eb94abd.tar.gz";
sha256 = "0fp85c907qw1qnxs40dx4yas9z5fqr9gszk4nazx90hwbimyk6n6"; sha256 = "079rzd17y2pk48kh70pbp4a7mh56vi2b49lzd365ckh38gdv702z";
}; };
in in