Merge pull request #251 from NixOS/dell

dell-xps-15-7590: remove 20.03 compat
This commit is contained in:
Jörg Thalheim 2021-04-25 08:48:49 +01:00 committed by GitHub
commit f7540d6c27
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -1,13 +1,5 @@
{ 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