JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #110803 from Ericson2314/fix-nixos-misc-linux-config

Browse Source 
nixos treewide: Fix references to linux-kernel.target
This commit is contained in:
John Ericson 2021-01-25 13:39:20 -05:00 committed by GitHub
commit e34a53c4ea
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
nixos/modules/system/boot/loader/generations-dir/generations-dir.nix
View File

@ -12,9 +12,6 @@ let
inherit (config.boot.loader.generationsDir) copyKernels;
};
# Temporary check, for nixos to cope both with nixpkgs stdenv-updates and trunk
inherit (pkgs.stdenv.hostPlatform) platform;
in
{
@ -59,7 +56,7 @@ in
system.build.installBootLoader = generationsDirBuilder;
system.boot.loader.id = "generationsDir";
system.boot.loader.kernelFile = linux-kernel.target;
system.boot.loader.kernelFile = pkgs.stdenv.hostPlatform.linux-kernel.target;
};
}

4
nixos/modules/system/boot/loader/raspberrypi/raspberrypi.nix
View File

@ -5,8 +5,6 @@ with lib;
let
cfg = config.boot.loader.raspberryPi;
inherit (pkgs.stdenv.hostPlatform) platform;
builderUboot = import ./uboot-builder.nix { inherit pkgs configTxt; inherit (cfg) version; };
builderGeneric = import ./raspberrypi-builder.nix { inherit pkgs configTxt; };
@ -102,6 +100,6 @@ in
system.build.installBootLoader = builder;
system.boot.loader.id = "raspberrypi";
system.boot.loader.kernelFile = linux-kernel.target;
system.boot.loader.kernelFile = pkgs.stdenv.hostPlatform.linux-kernel.target;
};
}