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

Merge pull request #196 from Mic92/eval-errors

Browse source 
raspberry-2: fix evaluation warning
This commit is contained in:
Jörg Thalheim 2020-10-20 06:35:43 +02:00 committed by GitHub
parent 770dbcdb49 986f101a66
commit 653f7ba3ca
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
raspberry-pi/2/default.nix
View file

@ -1,9 +1,11 @@
{ lib, pkgs, ...}: { lib, pkgs, ...}:
let
hasConsoleExtraTTYs = lib.versionAtLeast (lib.versions.majorMinor lib.version) "21.03";
in
{ {
boot = { boot = {
consoleLogLevel = lib.mkDefault 7; consoleLogLevel = lib.mkDefault 7;
extraTTYs = [ "ttyAMA0" ];
kernelPackages = lib.mkDefault pkgs.linuxPackages_rpi2; kernelPackages = lib.mkDefault pkgs.linuxPackages_rpi2;
kernelParams = [ kernelParams = [
"dwc_otg.lpm_enable=0" "dwc_otg.lpm_enable=0"
@ -19,8 +21,11 @@
version = lib.mkDefault 2; version = lib.mkDefault 2;
}; };
}; };
extraTTYs = lib.mkIf (!hasConsoleExtraTTYs) [ "ttyAMA0" ];
}; };
console.extraTTYs = lib.mkIf hasConsoleExtraTTYs [ "ttyAMA0" ];
nix.buildCores = 4; nix.buildCores = 4;
nixpkgs.config.platform = lib.systems.platforms.raspberrypi2; nixpkgs.config.platform = lib.systems.platforms.raspberrypi2;