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

Merge remote-tracking branch 'origin/master' into flexible-partition-table-and-fs

Browse source
This commit is contained in:
Travis Staton 2024-11-04 22:55:15 -05:00
commit 5c1f3831f9
No known key found for this signature in database
GPG key ID: E883E53CDAC16260
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;
initrd = "${config.system.build.initialRamdisk}/${config.system.boot.loader.initrdFile}"; initrd = "${config.system.build.initialRamdisk}/${config.system.boot.loader.initrdFile}";
in in
{ {
@ -328,7 +328,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

@ -31,7 +31,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;
initrd = "${config.system.build.initialRamdisk}/${config.system.boot.loader.initrdFile}"; initrd = "${config.system.build.initialRamdisk}/${config.system.boot.loader.initrdFile}";
populate-kernel = populate-kernel =
if cfg.uboot.enable if cfg.uboot.enable