aires/nixos-hardware
aires/nixos-hardware
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Support NixOS 19.09 for <dell/xps/15-7590> (#141)

Browse source 
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
This commit is contained in:
Rebecca Turner 2020-02-18 06:13:15 -05:00 committed by GitHub
parent 7accb4efab
commit 74efa57ee4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
dell/xps/15-7590/default.nix
View file

@ -1,6 +1,13 @@
{ lib, ... }: { 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 = [ imports = [
../../../common/cpu/intel ../../../common/cpu/intel
../../../common/pc/laptop ../../../common/pc/laptop
@ -28,8 +35,9 @@
nixpkgs.overlays = [ nixpkgs.overlays = [
(self: super: { (self: super: {
firmwareLinuxNonfree = super.firmwareLinuxNonfree.overrideAttrs (old: { firmwareLinuxNonfree = super.firmwareLinuxNonfree.overrideAttrs (old: {
src = super.fetchgit{ src = super.fetchgit {
url = "https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git"; url =
"https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git";
rev = "bf13a71b18af229b4c900b321ef1f8443028ded8"; rev = "bf13a71b18af229b4c900b321ef1f8443028ded8";
sha256 = "1dcaqdqyffxiadx420pg20157wqidz0c0ca5mrgyfxgrbh6a4mdj"; sha256 = "1dcaqdqyffxiadx420pg20157wqidz0c0ca5mrgyfxgrbh6a4mdj";
}; };