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

flake.nix: pkgs.system -> pkgs.stdenv.hostPlatform.system

Browse source 
`pkgs.system` is now an [alias][1] to `pkgs.stdenv.hostPlatform.system`.

After this it's possible to set `config.allowAliases = false` for nixpkgs:

```
nixOnDroidConfigurations.default = nix-on-droid.lib.nixOnDroidConfiguration {
  pkgs = import nixpkgs { config.allowAliases = false; system = "aarch64-linux"; };
  modules = [ ./nix-on-droid.nix ];
};
```

[1]: 3fa87fea66/pkgs/top-level/aliases.nix (L1386)
This commit is contained in:
Zhong Jianxin 2024-11-23 15:29:09 +08:00 • committed by Tobias Happ
parent 010aa48cf6
commit a7befd8c98
1 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

10
flake.nix
View file

@ -77,11 +77,11 @@
# deprecated:
, config ? null
, extraModules ? null
, system ? null # pkgs.system is used to detect user's arch
, system ? null # pkgs.stdenv.hostPlatform.system is used to detect user's arch
}:
if ! (builtins.elem pkgs.system [ "aarch64-linux" "x86_64-linux" ]) then
if ! (builtins.elem pkgs.stdenv.hostPlatform.system [ "aarch64-linux" "x86_64-linux" ]) then
throw
("${pkgs.system} is not supported; aarch64-linux / x86_64-linux " +
("${pkgs.stdenv.hostPlatform.system} is not supported; aarch64-linux / x86_64-linux " +
"are the only currently supported system types")
else
pkgs.lib.throwIf
@ -95,12 +95,12 @@
have been removed.
Instead of 'extraModules' use the argument 'modules'.
The 'system' will be inferred by 'pkgs.system',
The 'system' will be inferred by 'pkgs.stdenv.hostPlatform.system',
so pass a 'pkgs = import nixpkgs { system = "aarch64-linux"; };'
See the 22.11 release notes for more.
''
(import ./modules {
targetSystem = pkgs.system; # system to cross-compile to
targetSystem = pkgs.stdenv.hostPlatform.system; # system to cross-compile to
inherit extraSpecialArgs home-manager-path pkgs;
config.imports = modules;
isFlake = true;