mirror of
				https://github.com/NixOS/nixos-hardware.git
				synced 2025-11-04 17:27:14 +08:00 
			
		
		
		
	lenovo/thinkpad/p14s: check kernel version through config instead of pkgs
				
					
				
			The previous implementation was checking the kernel version through `pkgs.linux`, which is only representative of the final system if `boot.kernelPackages` is left as the default value of `pkgs.linuxPackages`. You can of course change this to other package sets, such as `pkgs.linuxPackages_latest`. Instead, we now reference the kernel through `config.boot.kernelPackages.kernel`.
This commit is contained in:
		
				
					committed by
					
						
						mergify[bot]
					
				
			
			
				
	
			
			
			
						parent
						
							6267b43af9
						
					
				
				
					commit
					6e80224000
				
			@@ -1,4 +1,4 @@
 | 
			
		||||
{ lib, pkgs, ... }:
 | 
			
		||||
{ config, lib, pkgs, ... }:
 | 
			
		||||
 | 
			
		||||
{
 | 
			
		||||
  # P14s is a rebadged T14 with slight internal differences.
 | 
			
		||||
@@ -14,7 +14,7 @@
 | 
			
		||||
  # "vendor" setting, in this case the thinkpad_acpi driver.
 | 
			
		||||
  # See https://hansdegoede.livejournal.com/27130.html
 | 
			
		||||
  # See https://lore.kernel.org/linux-acpi/20221105145258.12700-1-hdegoede@redhat.com/
 | 
			
		||||
  boot.kernelParams = lib.mkIf (lib.versionOlder pkgs.linux.version "6.2") [ "acpi_backlight=native" ];
 | 
			
		||||
  boot.kernelParams = lib.mkIf (lib.versionOlder config.boot.kernelPackages.kernel.version "6.2") [ "acpi_backlight=native" ];
 | 
			
		||||
 | 
			
		||||
  # see https://github.com/NixOS/nixpkgs/issues/69289
 | 
			
		||||
  boot.kernelPackages = lib.mkIf (lib.versionOlder pkgs.linux.version "5.2") pkgs.linuxPackages_latest;
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user