Skip to content

Commit

Permalink
fix compileDTS overlay for raspberry-pi (NixOS#754)
Browse files Browse the repository at this point in the history
* fix compileDTS overlay

due to NixOS/nixpkgs#251898
the compileDTS function has been moved to `device-tree`

nixos-hardware has an own overlay for the raspberry-pi
which needs the `compileDTS` function now, too.

This commit adds it.

Signed-off-by: Florian Brandes <[email protected]>

* apply review comments

Co-authored-by: Majiir Paktu <[email protected]>
Signed-off-by: Florian Brandes <[email protected]>

---------

Signed-off-by: Florian Brandes <[email protected]>
Co-authored-by: Majiir Paktu <[email protected]>
  • Loading branch information
gador and Majiir authored Oct 10, 2023
1 parent 6ea13c2 commit c2bbfcf
Showing 1 changed file with 3 additions and 1 deletion.
4 changes: 3 additions & 1 deletion raspberry-pi/4/pkgs-overlays.nix
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,9 @@
let
cfg = config.hardware.raspberry-pi."4".apply-overlays-dtmerge;
dt_ao_overlay = _final: prev: {
deviceTree.applyOverlays = prev.callPackage ./apply-overlays-dtmerge.nix { };
deviceTree = prev.deviceTree // {
applyOverlays = _final.callPackage ./apply-overlays-dtmerge.nix { };
};
};
in {
options.hardware = {
Expand Down

0 comments on commit c2bbfcf

Please sign in to comment.