nix-community/nix-on-droid
1
0
Fork 0
mirror of https://github.com/nix-community/nix-on-droid.git synced 2025-12-16 14:01:10 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

update nixpkgs; applyPatches to fix toolchain (nixpkgs!269077)

Browse source
This commit is contained in:
Alexander Sosedkin 2024-02-17 14:22:51 +01:00
parent 970a735f56
commit 6daee58791
13 changed files with 80 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -82,7 +82,7 @@ in
environment.files = {
inherit login loginInner;
prootStatic = "/nix/store/yrrs22jsl1y8niwzs2vvk0vblicr3903-proot-termux-static-aarch64-unknown-linux-android-unstable-2023-05-13";
prootStatic = "/nix/store/42q6yf0x0ka6jxxbprmrkzimqi4rvi6d-proot-termux-static-aarch64-unknown-linux-android-unstable-2023-05-13";
};
};

10
modules/environment/networking.nix
View file

@ -1,4 +1,4 @@
# Copyright (c) 2019-2023, see AUTHORS. Licensed under MIT License, see LICENSE.
# Copyright (c) 2019-2024, see AUTHORS. Licensed under MIT License, see LICENSE.
# Inspired by
# https://github.com/NixOS/nixpkgs/blob/master/nixos/modules/config/networking.nix
@ -19,9 +19,9 @@ in
###### interface
options = {
options.networking = {
networking.hosts = lib.mkOption {
hosts = lib.mkOption {
type = types.attrsOf (types.listOf types.str);
default = { };
example = literalExpression ''
@ -35,7 +35,7 @@ in
'';
};
networking.hostFiles = lib.mkOption {
hostFiles = lib.mkOption {
type = types.listOf types.path;
defaultText = literalMD "Hosts from {option}`networking.hosts` and {option}`networking.extraHosts`";
example = literalExpression ''[ "''${pkgs.my-blocklist-package}/share/my-blocklist/hosts" ]'';
@ -44,7 +44,7 @@ in
'';
};
networking.extraHosts = lib.mkOption {
extraHosts = lib.mkOption {
type = types.lines;
default = "";
example = "192.168.0.1 lanlocalhost";