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

chore: no double caching, compression now supported

Browse source
This commit is contained in:
adminy 2024-06-22 16:32:44 +01:00
parent 48bb6ed6fb
commit 4240bff280
3 changed files with 4 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

5
README.md
View file

@ -27,10 +27,9 @@ complete example.
{ {
description = "raspberry-pi-nix example"; description = "raspberry-pi-nix example";
nixConfig = { nixConfig = {
extra-substituters = [ "https://raspberry-pi-nix.cachix.org" https://adminy.cachix.org ]; extra-substituters = [ "https://raspberry-pi-nix.cachix.org" ];
extra-trusted-public-keys = [ extra-trusted-public-keys = [
"raspberry-pi-nix.cachix.org-1:WmV2rdSangxW0rZjY/tBvBDSaNFQ3DyEQsVw8EvHn9o=" "raspberry-pi-nix.cachix.org-1:WmV2rdSangxW0rZjY/tBvBDSaNFQ3DyEQsVw8EvHn9o="
"adminy.cachix.org-1:xgrsLa9L9VCdTbY5dMDqtcl6qBFHA9U56SgEJosNbFc=""
]; ];
}; };
inputs = { inputs = {
@ -293,3 +292,5 @@ is kept up to date by the overlay applied by this package, so you
don't need configure this. However, if you want to use different don't need configure this. However, if you want to use different
firmware you can override that package to do so. firmware you can override that package to do so.
## What's not working?
- [ ] Pi 5 u-boot devices other than sd-cards (i.e. usb, nvme).

5
overlays/default.nix
View file

@ -70,11 +70,6 @@ let
rpi-kernels = builtins.foldl' (b: a: b // rpi-kernel a) { }; rpi-kernels = builtins.foldl' (b: a: b // rpi-kernel a) { };
in in
{ {
# disable firmware compression so that brcm firmware can be found at
# the path expected by raspberry pi firmware/device tree
compressFirmwareXz = x: x;
compressFirmwareZstd = x: x;
# provide generic rpi arm64 u-boot # provide generic rpi arm64 u-boot
uboot_rpi_arm64 = prev.buildUBoot rec { uboot_rpi_arm64 = prev.buildUBoot rec {
defconfig = "rpi_arm64_defconfig"; defconfig = "rpi_arm64_defconfig";

3
rpi/config.nix
View file

@ -16,8 +16,7 @@ let
(lib.filterAttrs (k: v: v.enable) x); (lib.filterAttrs (k: v: v.enable) x);
render-dt-overlay = { overlay, args }: render-dt-overlay = { overlay, args }:
"dtoverlay=" + overlay + "\n" "dtoverlay=" + overlay + "\n"
+ lib.strings.concatMapStringsSep "\n" render-dt-param args + "\n" + lib.strings.concatMapStringsSep "\n" render-dt-param args + "\n";
+ "dtoverlay=";
render-base-dt-params = params: render-base-dt-params = params:
lib.strings.concatMapStringsSep "\n" render-dt-param lib.strings.concatMapStringsSep "\n" render-dt-param
(render-dt-kvs params); (render-dt-kvs params);