nix-community/raspberry-pi-nix
1
0
Fork 0
mirror of https://github.com/nix-community/raspberry-pi-nix.git synced 2025-11-09 03:56:03 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'nix-community:master' into master

Browse source
This commit is contained in:
Kyle Finlay 2024-11-07 23:22:19 +11:00 • committed by GitHub
commit 8edeafb354
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
rpi/default.nix
View file

@ -5,7 +5,7 @@ let
cfg = config.raspberry-pi-nix; cfg = config.raspberry-pi-nix;
version = cfg.kernel-version; version = cfg.kernel-version;
board = cfg.board; board = cfg.board;
kernel = pkgs.rpi-kernels."${version}"."${board}"; kernel = config.system.build.kernel;
in in
{ {
imports = [ ../sd-image ./config.nix ./i2c.nix ]; imports = [ ../sd-image ./config.nix ./i2c.nix ];
@ -323,7 +323,7 @@ in
"reset-raspberrypi" # required for vl805 firmware to load "reset-raspberrypi" # required for vl805 firmware to load
]; ];
}; };
kernelPackages = pkgs.linuxPackagesFor kernel; kernelPackages = pkgs.linuxPackagesFor pkgs.rpi-kernels."${version}"."${board}";
loader = { loader = {
grub.enable = lib.mkDefault false; grub.enable = lib.mkDefault false;
initScript.enable = !cfg.uboot.enable; initScript.enable = !cfg.uboot.enable;

2
sd-image/default.nix
View file

@ -22,7 +22,7 @@
cfg = config.raspberry-pi-nix; cfg = config.raspberry-pi-nix;
version = cfg.kernel-version; version = cfg.kernel-version;
board = cfg.board; board = cfg.board;
kernel = pkgs.rpi-kernels."${version}"."${board}"; kernel = config.system.build.kernel;
populate-kernel = populate-kernel =
if cfg.uboot.enable if cfg.uboot.enable
then '' then ''