mirror of
				https://github.com/NixOS/nixos-hardware.git
				synced 2025-11-04 17:27:14 +08:00 
			
		
		
		
	fix eval with 24.05
This commit is contained in:
		
				
					committed by
					
						
						mergify[bot]
					
				
			
			
				
	
			
			
			
						parent
						
							2e78b1af80
						
					
				
				
					commit
					f372fa6cfa
				
			@@ -1,4 +1,9 @@
 | 
			
		||||
{ pkgs, ... }:
 | 
			
		||||
{
 | 
			
		||||
  pkgs,
 | 
			
		||||
  lib,
 | 
			
		||||
  options,
 | 
			
		||||
  ...
 | 
			
		||||
}:
 | 
			
		||||
 | 
			
		||||
let
 | 
			
		||||
  # This file was obtained from the display while "DDG" mode was enabled.
 | 
			
		||||
@@ -8,18 +13,19 @@ let
 | 
			
		||||
  '';
 | 
			
		||||
in
 | 
			
		||||
{
 | 
			
		||||
  hardware.display = {
 | 
			
		||||
    edid.packages = [ chip_edid ];
 | 
			
		||||
  config = lib.optionalAttrs (options ? hardware.display) {
 | 
			
		||||
    hardware.display = {
 | 
			
		||||
      edid.packages = [ chip_edid ];
 | 
			
		||||
 | 
			
		||||
    outputs = {
 | 
			
		||||
      # For some reason, the internal display is sometimes eDP-1, and sometimes it's eDP-2
 | 
			
		||||
      "eDP-1".edid = "16ach6h.bin";
 | 
			
		||||
      "eDP-2".edid = "16ach6h.bin";
 | 
			
		||||
      outputs = {
 | 
			
		||||
        # For some reason, the internal display is sometimes eDP-1, and sometimes it's eDP-2
 | 
			
		||||
        "eDP-1".edid = "16ach6h.bin";
 | 
			
		||||
        "eDP-2".edid = "16ach6h.bin";
 | 
			
		||||
      };
 | 
			
		||||
    };
 | 
			
		||||
 | 
			
		||||
    # This fails at the moment, https://github.com/NixOS/nixos-hardware/issues/795
 | 
			
		||||
    # Extra refresh rates seem to work regardless
 | 
			
		||||
    # boot.initrd.extraFiles."lib/firmware/edid/16ach6h.bin".source = pkgs.runCommandLocal "chip_edid" { } "cp ${./16ach6h.bin} $out";
 | 
			
		||||
  };
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
  # This fails at the moment, https://github.com/NixOS/nixos-hardware/issues/795
 | 
			
		||||
  # Extra refresh rates seem to work regardless
 | 
			
		||||
  # boot.initrd.extraFiles."lib/firmware/edid/16ach6h.bin".source = pkgs.runCommandLocal "chip_edid" { } "cp ${./16ach6h.bin} $out";
 | 
			
		||||
}
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user