mirror of
				https://github.com/NixOS/nixos-hardware.git
				synced 2025-11-04 09:17:14 +08:00 
			
		
		
		
	Merge pull request #143 from Mic92/xps-15-7590
xps/15-7590: don't enable unfree firmware by default
This commit is contained in:
		@@ -25,22 +25,19 @@
 | 
			
		||||
 | 
			
		||||
  # The 48.ucode causes the Killer wifi card to crash.
 | 
			
		||||
  # The iwlfwifi-cc-a0-46.ucode works perfectly
 | 
			
		||||
  nixpkgs.pkgs = import <nixpkgs> {
 | 
			
		||||
    config.allowUnfree = true;
 | 
			
		||||
    overlays = [
 | 
			
		||||
      (self: super: {
 | 
			
		||||
        firmwareLinuxNonfree = super.firmwareLinuxNonfree.overrideAttrs (old: {
 | 
			
		||||
          src = super.fetchgit{
 | 
			
		||||
            url = "https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git";
 | 
			
		||||
            rev = "bf13a71b18af229b4c900b321ef1f8443028ded8";
 | 
			
		||||
            sha256 = "1dcaqdqyffxiadx420pg20157wqidz0c0ca5mrgyfxgrbh6a4mdj";
 | 
			
		||||
          };
 | 
			
		||||
          postInstall = ''
 | 
			
		||||
            rm $out/lib/firmware/iwlwifi-cc-a0-48.ucode
 | 
			
		||||
          '';
 | 
			
		||||
          outputHash = "0dq48i1cr8f0qx3nyq50l9w9915vhgpwmwiw3b4yhisbc3afyay4";
 | 
			
		||||
        });
 | 
			
		||||
      })
 | 
			
		||||
    ];
 | 
			
		||||
  };
 | 
			
		||||
  nixpkgs.overlays = [
 | 
			
		||||
    (self: super: {
 | 
			
		||||
      firmwareLinuxNonfree = super.firmwareLinuxNonfree.overrideAttrs (old: {
 | 
			
		||||
        src = super.fetchgit{
 | 
			
		||||
          url = "https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git";
 | 
			
		||||
          rev = "bf13a71b18af229b4c900b321ef1f8443028ded8";
 | 
			
		||||
          sha256 = "1dcaqdqyffxiadx420pg20157wqidz0c0ca5mrgyfxgrbh6a4mdj";
 | 
			
		||||
        };
 | 
			
		||||
        postInstall = ''
 | 
			
		||||
          rm $out/lib/firmware/iwlwifi-cc-a0-48.ucode
 | 
			
		||||
        '';
 | 
			
		||||
        outputHash = "0dq48i1cr8f0qx3nyq50l9w9915vhgpwmwiw3b4yhisbc3afyay4";
 | 
			
		||||
      });
 | 
			
		||||
    })
 | 
			
		||||
  ];
 | 
			
		||||
}
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user