diff options
author | Weijia Wang <9713184+wegank@users.noreply.github.com> | 2024-05-16 15:25:10 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-05-16 15:25:10 +0200 |
commit | b6f403758f93deb9e65860e480cc0a921bc1716f (patch) | |
tree | d7f5a20589d59c0f131e2d3d459398849bb25a0f /nixos/modules | |
parent | 97445937fdbaa82f46f76d53a0d6a2da4eeb2a4e (diff) | |
parent | da68f358bc114a337af38b1789779a066299137a (diff) |
Merge pull request #312169 from B4dM4n/remove-alias-usage
treewide: Remove usage of pkgs.{system,hostPlatform} aliases
Diffstat (limited to 'nixos/modules')
-rw-r--r-- | nixos/modules/system/boot/binfmt.nix | 2 | ||||
-rw-r--r-- | nixos/modules/virtualisation/lxc-image-metadata.nix | 4 | ||||
-rw-r--r-- | nixos/modules/virtualisation/qemu-vm.nix | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/nixos/modules/system/boot/binfmt.nix b/nixos/modules/system/boot/binfmt.nix index 572bfeda7a8ff..1d702442f7f66 100644 --- a/nixos/modules/system/boot/binfmt.nix +++ b/nixos/modules/system/boot/binfmt.nix @@ -280,7 +280,7 @@ in { }; config = { - boot.binfmt.registrations = builtins.listToAttrs (map (system: assert system != pkgs.system; { + boot.binfmt.registrations = builtins.listToAttrs (map (system: assert system != pkgs.stdenv.hostPlatform.system; { name = system; value = { config, ... }: let interpreter = getEmulator system; diff --git a/nixos/modules/virtualisation/lxc-image-metadata.nix b/nixos/modules/virtualisation/lxc-image-metadata.nix index 2c0568b4c4682..38d955798f3e0 100644 --- a/nixos/modules/virtualisation/lxc-image-metadata.nix +++ b/nixos/modules/virtualisation/lxc-image-metadata.nix @@ -87,10 +87,10 @@ in { contents = [ { source = toYAML "metadata.yaml" { - architecture = builtins.elemAt (builtins.match "^([a-z0-9_]+).+" (toString pkgs.system)) 0; + architecture = builtins.elemAt (builtins.match "^([a-z0-9_]+).+" (toString pkgs.stdenv.hostPlatform.system)) 0; creation_date = 1; properties = { - description = "${config.system.nixos.distroName} ${config.system.nixos.codeName} ${config.system.nixos.label} ${pkgs.system}"; + description = "${config.system.nixos.distroName} ${config.system.nixos.codeName} ${config.system.nixos.label} ${pkgs.stdenv.hostPlatform.system}"; os = "${config.system.nixos.distroId}"; release = "${config.system.nixos.codeName}"; }; diff --git a/nixos/modules/virtualisation/qemu-vm.nix b/nixos/modules/virtualisation/qemu-vm.nix index c30f4577fdd86..3b81cfaf2b8ca 100644 --- a/nixos/modules/virtualisation/qemu-vm.nix +++ b/nixos/modules/virtualisation/qemu-vm.nix @@ -912,7 +912,7 @@ in "ppc64-linux" = "tpm-spapr"; "armv7-linux" = "tpm-tis-device"; "aarch64-linux" = "tpm-tis-device"; - }.${pkgs.hostPlatform.system} or (throw "Unsupported system for TPM2 emulation in QEMU")); + }.${pkgs.stdenv.hostPlatform.system} or (throw "Unsupported system for TPM2 emulation in QEMU")); defaultText = '' Based on the guest platform Linux system: |