nixos/hardware.deviceTree: Move things around

In response to comments, create a sub-folder for deviceTree packages
(starting with rpi), and a top-level package for helpers.

2 files changed, 15 insertions, 12 deletions

diff --git a/pkgs/os-specific/linux/device-tree.nix b/pkgs/os-specific/linux/device-tree/default.nix
index 81dccac8b8c..13d819a08a5 100644
--- a/pkgs/os-specific/linux/device-tree.nix
+++ b/pkgs/os-specific/linux/device-tree/default.nix
@@ -1,4 +1,4 @@
-{ stdenvNoCC, dtc, findutils, raspberrypifw }:
+{ stdenvNoCC, dtc, findutils }:
 
 with stdenvNoCC.lib; {
   applyOverlays = (base: overlays: stdenvNoCC.mkDerivation {
@@ -14,15 +14,4 @@ with stdenvNoCC.lib; {
       done
     '';
   });
-
-  raspberryPiDtbs = stdenvNoCC.mkDerivation {
-    name = "raspberrypi-dtbs-${raspberrypifw.version}";
-    nativeBuildInputs = [ raspberrypifw ];
-    buildCommand = ''
-      mkdir -p $out/broadcom/
-      cp ${raspberrypifw}/share/raspberrypi/boot/bcm*.dtb $out/broadcom
-    '';
-  };
-
-  raspberryPiOverlays = "${raspberrypifw}/share/raspberrypi/boot/overlays";
 }
diff --git a/pkgs/os-specific/linux/device-tree/raspberrypi.nix b/pkgs/os-specific/linux/device-tree/raspberrypi.nix
new file mode 100644
index 00000000000..aa6edefd74d
--- /dev/null
+++ b/pkgs/os-specific/linux/device-tree/raspberrypi.nix
@@ -0,0 +1,14 @@
+{ stdenvNoCC, raspberrypifw }:
+
+stdenvNoCC.mkDerivation {
+  name = "raspberrypi-dtbs-${raspberrypifw.version}";
+  nativeBuildInputs = [ raspberrypifw ];
+  buildCommand = ''
+    mkdir -p $out/broadcom/
+    cp ${raspberrypifw}/share/raspberrypi/boot/bcm*.dtb $out/broadcom
+  '';
+  passthru = {
+    # Compatible overlays that may be used
+    overlays = "${raspberrypifw}/share/raspberrypi/boot/overlays";
+  };
+}