diff options
| author | John Ericson <git@JohnEricson.me> | 2021-01-25 13:39:20 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-25 13:39:20 -0500 |
| commit | e34a53c4ea8459f7a57a361a3891b4dd15ea10f5 (patch) | |
| tree | 5e75193c0f4672f6a618fee362721ea7d3910c24 /nixos | |
| parent | b7871c3f2da1a38bccd839401f6113f734f62e43 (diff) | |
| parent | 63b02e55dbf929366543d0cd7ebdf5b68e18d794 (diff) | |
Merge pull request #110803 from Ericson2314/fix-nixos-misc-linux-config
nixos treewide: Fix references to linux-kernel.target
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/modules/system/boot/loader/generations-dir/generations-dir.nix | 5 | ||||
| -rw-r--r-- | nixos/modules/system/boot/loader/raspberrypi/raspberrypi.nix | 4 |
2 files changed, 2 insertions, 7 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 fee567a510ba..1437ab387700 100644 --- a/nixos/modules/system/boot/loader/generations-dir/generations-dir.nix +++ b/nixos/modules/system/boot/loader/generations-dir/generations-dir.nix @@ -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; }; } diff --git a/nixos/modules/system/boot/loader/raspberrypi/raspberrypi.nix b/nixos/modules/system/boot/loader/raspberrypi/raspberrypi.nix index 061f2967350e..1023361f0b1f 100644 --- a/nixos/modules/system/boot/loader/raspberrypi/raspberrypi.nix +++ b/nixos/modules/system/boot/loader/raspberrypi/raspberrypi.nix @@ -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; }; } |