diff options
author | John Ericson <mail@JohnEricson.me> | 2018-08-20 14:23:13 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-08-20 14:23:13 -0400 |
commit | 8f6a72d25b4c7e582883e2b18c3df7811be6eb08 (patch) | |
tree | f97600a046c7e1aced627935dccdcb226aed2bde | |
parent | f305b9b0862f28a85a3dcc2a517d4fcb345abc42 (diff) | |
parent | 72f5078bebd8cad9614fe61535567d7ce4b737d3 (diff) | |
download | nixlib-8f6a72d25b4c7e582883e2b18c3df7811be6eb08.tar nixlib-8f6a72d25b4c7e582883e2b18c3df7811be6eb08.tar.gz nixlib-8f6a72d25b4c7e582883e2b18c3df7811be6eb08.tar.bz2 nixlib-8f6a72d25b4c7e582883e2b18c3df7811be6eb08.tar.lz nixlib-8f6a72d25b4c7e582883e2b18c3df7811be6eb08.tar.xz nixlib-8f6a72d25b4c7e582883e2b18c3df7811be6eb08.tar.zst nixlib-8f6a72d25b4c7e582883e2b18c3df7811be6eb08.zip |
Merge pull request #45398 from volth/patch-234
top-level.nix: stdenv.platform -> stdenv.hostPlatform.platform
-rw-r--r-- | nixos/modules/system/activation/top-level.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/nixos/modules/system/activation/top-level.nix b/nixos/modules/system/activation/top-level.nix index da29e08b3691..96a669d81461 100644 --- a/nixos/modules/system/activation/top-level.nix +++ b/nixos/modules/system/activation/top-level.nix @@ -46,7 +46,7 @@ let ln -s ${kernelPath} $out/kernel ln -s ${config.system.modulesTree} $out/kernel-modules - ${optionalString (pkgs.stdenv.platform.kernelDTB or false) '' + ${optionalString (pkgs.stdenv.hostPlatform.platform.kernelDTB or false) '' ln -s ${config.boot.kernelPackages.kernel}/dtbs $out/dtbs ''} @@ -175,7 +175,7 @@ in system.boot.loader.kernelFile = mkOption { internal = true; - default = pkgs.stdenv.platform.kernelTarget; + default = pkgs.stdenv.hostPlatform.platform.kernelTarget; type = types.str; description = '' Name of the kernel file to be passed to the bootloader. |