From d1e793f4c0e51bdad0ea87ba66921b1d79d827c2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Thu, 18 May 2023 02:07:27 +0200 Subject: [PATCH] rpi-netboot: fix kernel --- modules/audio-server.nix | 3 ++- modules/rpi-netboot.nix | 3 +++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/modules/audio-server.nix b/modules/audio-server.nix index 5099d4f4..409a0235 100644 --- a/modules/audio-server.nix +++ b/modules/audio-server.nix @@ -6,7 +6,8 @@ }; config = lib.mkIf config.c3d2.audioServer.enable { - boot.kernelPackages = pkgs.linuxPackages-rt_latest; + # higher than mkDefault but lower than no priority to allow easy overwriting in rpi-netboot + boot.kernelPackages = lib.mkOverride 900 pkgs.linuxPackages-rt_latest; environment.systemPackages = with pkgs; [ mpd diff --git a/modules/rpi-netboot.nix b/modules/rpi-netboot.nix index d1cf93f7..e95b4adb 100644 --- a/modules/rpi-netboot.nix +++ b/modules/rpi-netboot.nix @@ -12,6 +12,9 @@ enable_uart=0 ''; }; + # repeat https://github.com/NixOS/nixos-hardware/blob/master/raspberry-pi/4/default.nix#L20 + # to overwrite audio module + kernelPackages = pkgs.linuxKernel.packages.linux_rpi4; kernelParams = [ "verbose" "shell_on_fail" "elevator=deadline"