From a7befd8c98f02bbaf48fb229cb20b9a450d9ffad Mon Sep 17 00:00:00 2001 From: Zhong Jianxin Date: Sat, 23 Nov 2024 15:29:09 +0800 Subject: [PATCH] flake.nix: pkgs.system -> pkgs.stdenv.hostPlatform.system `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]: https://github.com/NixOS/nixpkgs/blob/3fa87fea664455138adbb1b5561949d5efb74438/pkgs/top-level/aliases.nix#L1386 --- flake.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/flake.nix b/flake.nix index ad92e98..cd09399 100644 --- a/flake.nix +++ b/flake.nix @@ -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;