about summary refs log tree commit diff
path: root/nixos/modules
diff options
context:
space:
mode:
authornikstur <nikstur@outlook.com>2024-03-12 12:57:15 +0100
committerGitHub <noreply@github.com>2024-03-12 12:57:15 +0100
commitda05945c74fcb2a7eb8fe49be8803b74b6a17b07 (patch)
tree2ec8c726a788c81482fda79fe018feba24408202 /nixos/modules
parent712867be99fbe78f7cf68bf84e4b1e222d0c192b (diff)
parent2837c0d9aa2c344212541776c9bedd69fc8b4111 (diff)
downloadnixlib-da05945c74fcb2a7eb8fe49be8803b74b6a17b07.tar
nixlib-da05945c74fcb2a7eb8fe49be8803b74b6a17b07.tar.gz
nixlib-da05945c74fcb2a7eb8fe49be8803b74b6a17b07.tar.bz2
nixlib-da05945c74fcb2a7eb8fe49be8803b74b6a17b07.tar.lz
nixlib-da05945c74fcb2a7eb8fe49be8803b74b6a17b07.tar.xz
nixlib-da05945c74fcb2a7eb8fe49be8803b74b6a17b07.tar.zst
nixlib-da05945c74fcb2a7eb8fe49be8803b74b6a17b07.zip
Merge pull request #295096 from jmbaur/uki-dtb
nixos/uki: add ".dtb" section if devicetree is used
Diffstat (limited to 'nixos/modules')
-rw-r--r--nixos/modules/system/boot/uki.nix2
1 files changed, 2 insertions, 0 deletions
diff --git a/nixos/modules/system/boot/uki.nix b/nixos/modules/system/boot/uki.nix
index ce00ac8e6397..0965b887c12e 100644
--- a/nixos/modules/system/boot/uki.nix
+++ b/nixos/modules/system/boot/uki.nix
@@ -75,6 +75,8 @@ in
         OSRelease = lib.mkOptionDefault "@${config.system.build.etc}/etc/os-release";
         # This is needed for cross compiling.
         EFIArch = lib.mkOptionDefault efiArch;
+      } // lib.optionalAttrs (config.hardware.deviceTree.enable && config.hardware.deviceTree.name != null) {
+        DeviceTree = lib.mkOptionDefault "${config.hardware.deviceTree.package}/${config.hardware.deviceTree.name}";
       };
     };