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

Merge 315b321fe7 into 5d88ff2519

Browse source
This commit is contained in:
Sandro 2025-01-19 15:14:44 +01:00 • committed by GitHub
commit 12acaf77fb
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
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: # deprecated:
, config ? null , config ? null
, extraModules ? null , extraModules ? null
, system ? null # pkgs.system is used to detect user's arch , system ? null # pkgs.stdenv.system is used to detect user's arch
}: }:
if ! (builtins.elem pkgs.system [ "aarch64-linux" "x86_64-linux" ]) then if ! (builtins.elem pkgs.stdenv.system [ "aarch64-linux" "x86_64-linux" ]) then
throw throw
("${pkgs.system} is not supported; aarch64-linux / x86_64-linux " + ("${pkgs.stdenv.system} is not supported; aarch64-linux / x86_64-linux " +
"are the only currently supported system types") "are the only currently supported system types")
else else
pkgs.lib.throwIf pkgs.lib.throwIf
@ -95,12 +95,12 @@
have been removed. have been removed.
Instead of 'extraModules' use the argument 'modules'. Instead of 'extraModules' use the argument 'modules'.
The 'system' will be inferred by 'pkgs.system', The 'system' will be inferred by 'pkgs.stdenv.system',
so pass a 'pkgs = import nixpkgs { system = "aarch64-linux"; };' so pass a 'pkgs = import nixpkgs { system = "aarch64-linux"; };'
See the 22.11 release notes for more. See the 22.11 release notes for more.
'' ''
(import ./modules { (import ./modules {
targetSystem = pkgs.system; # system to cross-compile to targetSystem = pkgs.stdenv.system; # system to cross-compile to
inherit extraSpecialArgs home-manager-path pkgs; inherit extraSpecialArgs home-manager-path pkgs;
config.imports = modules; config.imports = modules;
isFlake = true; isFlake = true;