NixOS/mobile-nixos
1
1
Fork 0
mirror of https://github.com/NixOS/mobile-nixos.git synced 2025-01-08 12:48:50 +03:00
Code Issues Projects Releases Wiki Activity

treewide: remove references to toplevel platform attrs

Browse Source 
The preferred way to refer to these is via stdenv.*Platform.
These will eventually be aliases in upstream Nixpkgs.
This commit is contained in:
Ryan Burns 2022-01-01 16:41:31 -08:00
parent 8a105e1776
commit b8471202d3
4 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
modules/system-target.nix
View File

@ -28,8 +28,8 @@ in
config = {
assertions = [
{
assertion = pkgs.targetPlatform.system == cfg.system;
message = "pkgs.targetPlatform.system expected to be `${cfg.system}`, is `${pkgs.targetPlatform.system}`";
assertion = pkgs.stdenv.targetPlatform.system == cfg.system;
message = "pkgs.stdenv.targetPlatform.system expected to be `${cfg.system}`, is `${pkgs.stdenv.targetPlatform.system}`";
}
];

2
modules/system-types/u-boot/default.nix
View File

@ -106,7 +106,7 @@ let
buildPackages.ubootTools
];
} ''
mkimage -C none -A ${ubootPlatforms.${pkgs.targetPlatform.system}} -T script -d ${bootcmd} $out
mkimage -C none -A ${ubootPlatforms.${pkgs.stdenv.targetPlatform.system}} -T script -d ${bootcmd} $out
'';
# TODO: use generatedFilesystems

5
modules/system-types/uefi/default.nix
View File

@ -4,7 +4,8 @@ let
enabled = config.mobile.system.type == "uefi";
inherit (lib) mkEnableOption mkIf mkOption types;
inherit (pkgs) hostPlatform imageBuilder runCommandNoCC;
inherit (pkgs.stdenv) hostPlatform;
inherit (pkgs) imageBuilder runCommandNoCC;
inherit (config.mobile.outputs) recovery stage-0;
cfg = config.mobile.quirks.uefi;
deviceName = config.mobile.device.name;
@ -17,7 +18,7 @@ let
"x86_64-linux" = "x64";
"aarch64-linux" = "aa64";
};
uefiPlatform = uefiPlatforms.${pkgs.targetPlatform.system};
uefiPlatform = uefiPlatforms.${pkgs.stdenv.targetPlatform.system};
kernelParamsFile = pkgs.writeText "${deviceName}-boot.cmd" config.boot.kernelParams;

2
modules/system-types/uefi/vm.nix
View File

@ -65,7 +65,7 @@ in
-netdev "user,id=user.0"
)
${pkgs.qemu}/bin/qemu-system-${pkgs.targetPlatform.qemuArch} "''${ARGS[@]}" "''${@}"
${pkgs.qemu}/bin/qemu-system-${pkgs.stdenv.targetPlatform.qemuArch} "''${ARGS[@]}" "''${@}"
'';
};
};