lenn/nixos-hardware
1
0
Fork 0
mirror of https://github.com/NixOS/nixos-hardware.git synced 2025-11-04 17:27:14 +08:00
Code Issues Packages Projects Releases Wiki Activity

xps/15-7590: don't enable unfree firmware by default

Browse Source 
Also don't set nixpkgs.pkgs. Instead just add an overlay.
This commit is contained in:
Jörg Thalheim
2020-02-09 08:40:38 +00:00
parent 2ab4e61b32
commit 6587634ad8
2 changed files with 18 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
dell/xps/15-7590/README.wiki
View File

@@ -24,7 +24,9 @@ These settings are needed both for booting the final install, and installer itse
=== Wifi === === Wifi ===
~~Wifi does not work with kernels older than 5.1 (firmware not present) or newer~~ (https://bbs.archlinux.org/viewtopic.php?id=247705) ~~Wifi does not work with kernels older than 5.1 (firmware not present) or newer~~ (https://bbs.archlinux.org/viewtopic.php?id=247705)
Update: The 48.ucode causes the Killer wifi card to crash. The iwlfwifi-cc-a0-46.ucode works perfectly. default.nix contains an overlay that removes the offending ucode from the linux-firmware bundle. Update: The 48.ucode causes the Killer wifi card to crash. The iwlfwifi-cc-a0-46.ucode works perfectly.
default.nix contains an overlay that removes the offending ucode from the linux-firmware bundle.
To use it one also needs to enable unfree firmware in their own configuration (<code>hardware.enableRedistributableFirmware = true;</code>)
``` ```
# Use the systemd-boot EFI boot loader. # Use the systemd-boot EFI boot loader.

33
dell/xps/15-7590/default.nix
View File

@@ -18,22 +18,19 @@
# The 48.ucode causes the Killer wifi card to crash. # The 48.ucode causes the Killer wifi card to crash.
# The iwlfwifi-cc-a0-46.ucode works perfectly # The iwlfwifi-cc-a0-46.ucode works perfectly
nixpkgs.pkgs = import <nixpkgs> { nixpkgs.overlays = [
config.allowUnfree = true; (self: super: {
overlays = [ firmwareLinuxNonfree = super.firmwareLinuxNonfree.overrideAttrs (old: {
(self: super: { src = super.fetchgit{
firmwareLinuxNonfree = super.firmwareLinuxNonfree.overrideAttrs (old: { url = "https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git";
src = super.fetchgit{ rev = "bf13a71b18af229b4c900b321ef1f8443028ded8";
url = "https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git"; sha256 = "1dcaqdqyffxiadx420pg20157wqidz0c0ca5mrgyfxgrbh6a4mdj";
rev = "bf13a71b18af229b4c900b321ef1f8443028ded8"; };
sha256 = "1dcaqdqyffxiadx420pg20157wqidz0c0ca5mrgyfxgrbh6a4mdj"; postInstall = ''
}; rm $out/lib/firmware/iwlwifi-cc-a0-48.ucode
postInstall = '' '';
rm $out/lib/firmware/iwlwifi-cc-a0-48.ucode outputHash = "0dq48i1cr8f0qx3nyq50l9w9915vhgpwmwiw3b4yhisbc3afyay4";
''; });
outputHash = "0dq48i1cr8f0qx3nyq50l9w9915vhgpwmwiw3b4yhisbc3afyay4"; })
}); ];
})
];
};
} }