diff options
| author | Jonathan Ringer <jonringer117@gmail.com> | 2021-01-22 14:07:06 -0800 |
|---|---|---|
| committer | Jonathan Ringer <jonringer117@gmail.com> | 2021-01-22 14:07:06 -0800 |
| commit | 0bc275e63423456d6deb650e146120c39c1e0723 (patch) | |
| tree | 1d33aa707b24fa58952162457e243c731836f99b /nixos/modules/system | |
| parent | 2e5475381b65290e08d357fa1434bd28d0c21cfa (diff) | |
| download | nixpkgs-0bc275e63423456d6deb650e146120c39c1e0723.tar nixpkgs-0bc275e63423456d6deb650e146120c39c1e0723.tar.gz nixpkgs-0bc275e63423456d6deb650e146120c39c1e0723.tar.bz2 nixpkgs-0bc275e63423456d6deb650e146120c39c1e0723.tar.lz nixpkgs-0bc275e63423456d6deb650e146120c39c1e0723.tar.xz nixpkgs-0bc275e63423456d6deb650e146120c39c1e0723.tar.zst nixpkgs-0bc275e63423456d6deb650e146120c39c1e0723.zip | |
Revert "lib: Clean up how linux and gcc config is specified"
This is a stdenv-rebuild, and should not be merged into master This reverts commit 8929989614589ee3acd070a6409b2b9700c92d65.
Diffstat (limited to 'nixos/modules/system')
3 files changed, 3 insertions, 3 deletions
diff --git a/nixos/modules/system/activation/top-level.nix b/nixos/modules/system/activation/top-level.nix index b0f77ca3fb8..03d7e749323 100644 --- a/nixos/modules/system/activation/top-level.nix +++ b/nixos/modules/system/activation/top-level.nix @@ -190,7 +190,7 @@ in system.boot.loader.kernelFile = mkOption { internal = true; - default = pkgs.stdenv.hostPlatform.linux-kernel.target; + default = pkgs.stdenv.hostPlatform.platform.kernelTarget; type = types.str; description = '' Name of the kernel file to be passed to the bootloader. 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 fee567a510b..2d27611946e 100644 --- a/nixos/modules/system/boot/loader/generations-dir/generations-dir.nix +++ b/nixos/modules/system/boot/loader/generations-dir/generations-dir.nix @@ -59,7 +59,7 @@ in system.build.installBootLoader = generationsDirBuilder; system.boot.loader.id = "generationsDir"; - system.boot.loader.kernelFile = linux-kernel.target; + system.boot.loader.kernelFile = platform.kernelTarget; }; } diff --git a/nixos/modules/system/boot/loader/raspberrypi/raspberrypi.nix b/nixos/modules/system/boot/loader/raspberrypi/raspberrypi.nix index db22dd36cbe..ba936b26573 100644 --- a/nixos/modules/system/boot/loader/raspberrypi/raspberrypi.nix +++ b/nixos/modules/system/boot/loader/raspberrypi/raspberrypi.nix @@ -103,6 +103,6 @@ in system.build.installBootLoader = builder; system.boot.loader.id = "raspberrypi"; - system.boot.loader.kernelFile = linux-kernel.target; + system.boot.loader.kernelFile = platform.kernelTarget; }; } |