diff options
| author | Rebecca Turner <rbt@sent.as> | 2020-02-18 06:13:15 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-18 11:13:15 +0000 |
| commit | 74efa57ee46ece7ccd95fc133c08badb798f0552 (patch) | |
| tree | cc2cc9e21a9b294c4bcf138e1a6fdc3d2761f712 | |
| parent | 7accb4efab5c4e1e680f4f632a52cba5243a8cb6 (diff) | |
Support NixOS 19.09 for <dell/xps/15-7590> (#141)
Virtual console options were renamed in 20.03; use `console.earlySetup`
or `boot.earlyVconsoleSetup` depending on OS version.
https://github.com/NixOS/nixos-hardware/pull/114#discussion_r374953204
| -rw-r--r-- | dell/xps/15-7590/default.nix | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/dell/xps/15-7590/default.nix b/dell/xps/15-7590/default.nix index 2fcaf8b..eeb69e2 100644 --- a/dell/xps/15-7590/default.nix +++ b/dell/xps/15-7590/default.nix @@ -1,6 +1,13 @@ { lib, ... }: - -{ +# Earlier font-size setup. +# Virtual console options were renamed in 20.03; use the right option depending +# on the OS version; keep this here at least until 20.03 is stable. +lib.recursiveUpdate +(if lib.versionAtLeast (lib.versions.majorMinor lib.version) "20.03" then { + console.earlySetup = true; +} else { + boot.earlyVconsoleSetup = true; +}) { imports = [ ../../../common/cpu/intel ../../../common/pc/laptop @@ -28,8 +35,9 @@ nixpkgs.overlays = [ (self: super: { firmwareLinuxNonfree = super.firmwareLinuxNonfree.overrideAttrs (old: { - src = super.fetchgit{ - url = "https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git"; + src = super.fetchgit { + url = + "https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git"; rev = "bf13a71b18af229b4c900b321ef1f8443028ded8"; sha256 = "1dcaqdqyffxiadx420pg20157wqidz0c0ca5mrgyfxgrbh6a4mdj"; }; |