Skip to content

Commit

Permalink
Support NixOS 19.09 for <dell/xps/15-7590> (#141)
Browse files Browse the repository at this point in the history
Virtual console options were renamed in 20.03; use `console.earlySetup`
or `boot.earlyVconsoleSetup` depending on OS version.

#114 (comment)
  • Loading branch information
9999years committed Feb 18, 2020
1 parent 7accb4e commit 74efa57
Showing 1 changed file with 12 additions and 4 deletions.
16 changes: 12 additions & 4 deletions 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
Expand Down Expand Up @@ -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";
};
Expand Down

0 comments on commit 74efa57

Please sign in to comment.