From c2bbfcfc3d12351919f8df7c7d6528f41751d0a3 Mon Sep 17 00:00:00 2001
From: Florian <florian.brandes@posteo.de>
Date: Tue, 10 Oct 2023 23:58:03 +0200
Subject: [PATCH] fix compileDTS overlay for raspberry-pi (#754)

* fix compileDTS overlay

due to https://github.com/NixOS/nixpkgs/pull/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 <florian.brandes@posteo.de>

* apply review comments

Co-authored-by: Majiir Paktu <majiir@nabaal.net>
Signed-off-by: Florian Brandes <florian.brandes@posteo.de>

---------

Signed-off-by: Florian Brandes <florian.brandes@posteo.de>
Co-authored-by: Majiir Paktu <majiir@nabaal.net>
---
 raspberry-pi/4/pkgs-overlays.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/raspberry-pi/4/pkgs-overlays.nix b/raspberry-pi/4/pkgs-overlays.nix
index cc639d4..8c3e29a 100644
--- a/raspberry-pi/4/pkgs-overlays.nix
+++ b/raspberry-pi/4/pkgs-overlays.nix
@@ -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 = {