diff options
| author | John Ericson <mail@JohnEricson.me> | 2018-08-20 15:50:53 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-20 15:50:53 -0400 |
| commit | 70a0c15054b63bb5eb06c892a3f0bf8f58215188 (patch) | |
| tree | 404c4c24cf391f6f59b6b731987de051743cb98d /nixos/modules | |
| parent | f0d6e22b7f0d89f4474abd41b917a18cec128529 (diff) | |
| parent | 7d85ade0ccf4fdb0b93fdbd18a07249a360144d4 (diff) | |
| download | nixlib-70a0c15054b63bb5eb06c892a3f0bf8f58215188.tar nixlib-70a0c15054b63bb5eb06c892a3f0bf8f58215188.tar.gz nixlib-70a0c15054b63bb5eb06c892a3f0bf8f58215188.tar.bz2 nixlib-70a0c15054b63bb5eb06c892a3f0bf8f58215188.tar.lz nixlib-70a0c15054b63bb5eb06c892a3f0bf8f58215188.tar.xz nixlib-70a0c15054b63bb5eb06c892a3f0bf8f58215188.tar.zst nixlib-70a0c15054b63bb5eb06c892a3f0bf8f58215188.zip | |
Merge pull request #45403 from obsidiansystems/purge-bare-platform
treewide: Purge `stdenv.platform` and top-level `platform`
Diffstat (limited to 'nixos/modules')
3 files changed, 4 insertions, 4 deletions
diff --git a/nixos/modules/installer/netboot/netboot.nix b/nixos/modules/installer/netboot/netboot.nix index a4eda3c52dce..a2c8e26f62c2 100644 --- a/nixos/modules/installer/netboot/netboot.nix +++ b/nixos/modules/installer/netboot/netboot.nix @@ -28,7 +28,7 @@ with lib; ++ (if pkgs.stdenv.system == "aarch64-linux" then [] else [ pkgs.grub2 pkgs.syslinux ]); - system.boot.loader.kernelFile = pkgs.stdenv.platform.kernelTarget; + system.boot.loader.kernelFile = pkgs.stdenv.hostPlatform.platform.kernelTarget; fileSystems."/" = { fsType = "tmpfs"; @@ -86,7 +86,7 @@ with lib; system.build.netbootIpxeScript = pkgs.writeTextDir "netboot.ipxe" '' #!ipxe - kernel ${pkgs.stdenv.platform.kernelTarget} init=${config.system.build.toplevel}/init ${toString config.boot.kernelParams} + kernel ${pkgs.stdenv.hostPlatform.platform.kernelTarget} init=${config.system.build.toplevel}/init ${toString config.boot.kernelParams} initrd initrd boot ''; diff --git a/nixos/modules/system/boot/loader/generations-dir/generations-dir.nix b/nixos/modules/system/boot/loader/generations-dir/generations-dir.nix index f8a00784034a..2d27611946e2 100644 --- a/nixos/modules/system/boot/loader/generations-dir/generations-dir.nix +++ b/nixos/modules/system/boot/loader/generations-dir/generations-dir.nix @@ -13,7 +13,7 @@ let }; # Temporary check, for nixos to cope both with nixpkgs stdenv-updates and trunk - platform = pkgs.stdenv.platform; + inherit (pkgs.stdenv.hostPlatform) platform; in diff --git a/nixos/modules/system/boot/loader/raspberrypi/raspberrypi.nix b/nixos/modules/system/boot/loader/raspberrypi/raspberrypi.nix index f974d07da9e5..9bec24c53f5b 100644 --- a/nixos/modules/system/boot/loader/raspberrypi/raspberrypi.nix +++ b/nixos/modules/system/boot/loader/raspberrypi/raspberrypi.nix @@ -15,7 +15,7 @@ let inherit configTxt; }; - platform = pkgs.stdenv.platform; + inherit (pkgs.stdenv.hostPlatform) platform; builderUboot = import ./builder_uboot.nix { inherit config; inherit pkgs; inherit configTxt; }; |