diff options
author | John Ericson <John.Ericson@Obsidian.Systems> | 2018-08-20 15:18:07 -0400 |
---|---|---|
committer | John Ericson <John.Ericson@Obsidian.Systems> | 2018-08-20 15:22:46 -0400 |
commit | 7d85ade0ccf4fdb0b93fdbd18a07249a360144d4 (patch) | |
tree | 404c4c24cf391f6f59b6b731987de051743cb98d /nixos/modules/system | |
parent | f0d6e22b7f0d89f4474abd41b917a18cec128529 (diff) | |
download | nixpkgs-7d85ade0ccf4fdb0b93fdbd18a07249a360144d4.tar nixpkgs-7d85ade0ccf4fdb0b93fdbd18a07249a360144d4.tar.gz nixpkgs-7d85ade0ccf4fdb0b93fdbd18a07249a360144d4.tar.bz2 nixpkgs-7d85ade0ccf4fdb0b93fdbd18a07249a360144d4.tar.lz nixpkgs-7d85ade0ccf4fdb0b93fdbd18a07249a360144d4.tar.xz nixpkgs-7d85ade0ccf4fdb0b93fdbd18a07249a360144d4.tar.zst nixpkgs-7d85ade0ccf4fdb0b93fdbd18a07249a360144d4.zip |
treewide: Purge `stdenv.platform` and top-level `platform`
Progress towards #27069
Diffstat (limited to 'nixos/modules/system')
-rw-r--r-- | nixos/modules/system/boot/loader/generations-dir/generations-dir.nix | 2 | ||||
-rw-r--r-- | nixos/modules/system/boot/loader/raspberrypi/raspberrypi.nix | 2 |
2 files changed, 2 insertions, 2 deletions
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 f8a00784034..2d27611946e 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 f974d07da9e..9bec24c53f5 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; }; |