diff options
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/os-specific/linux/device-tree/default.nix (renamed from pkgs/os-specific/linux/device-tree.nix) | 13 | ||||
-rw-r--r-- | pkgs/os-specific/linux/device-tree/raspberrypi.nix | 14 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
3 files changed, 18 insertions, 13 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"; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 44cd12b4db6..d5698ee3914 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -169,7 +169,9 @@ in demoit = callPackage ../servers/demoit { }; - deviceTree = callPackage ../os-specific/linux/device-tree.nix {}; + deviceTree = callPackage ../os-specific/linux/device-tree {}; + + device-tree_rpi = callPackage ../os-specific/linux/device-tree/raspberrypi.nix {}; diffPlugins = (callPackage ../build-support/plugins.nix {}).diffPlugins; |