diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2024-03-12 12:01:40 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-03-12 12:01:40 +0000 |
| commit | 1cef2a1be7ae3b22cfb3d11d8a30065eb1efe1dc (patch) | |
| tree | bad0b8654d164a086b1099f592b22a5ae99863aa /nixos/modules | |
| parent | debbeca23b5acff1824a5adb74eb9d693458e6a4 (diff) | |
| parent | 2e2cc05898bbe54a8004801ea300525b231d24e2 (diff) | |
| download | nixlib-1cef2a1be7ae3b22cfb3d11d8a30065eb1efe1dc.tar nixlib-1cef2a1be7ae3b22cfb3d11d8a30065eb1efe1dc.tar.gz nixlib-1cef2a1be7ae3b22cfb3d11d8a30065eb1efe1dc.tar.bz2 nixlib-1cef2a1be7ae3b22cfb3d11d8a30065eb1efe1dc.tar.lz nixlib-1cef2a1be7ae3b22cfb3d11d8a30065eb1efe1dc.tar.xz nixlib-1cef2a1be7ae3b22cfb3d11d8a30065eb1efe1dc.tar.zst nixlib-1cef2a1be7ae3b22cfb3d11d8a30065eb1efe1dc.zip | |
Merge staging-next into staging
Diffstat (limited to 'nixos/modules')
| -rw-r--r-- | nixos/modules/system/boot/uki.nix | 2 |
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}"; }; }; |